*shitload of color changes to get closer to the original wii menu.
*added sliding top and bottom in settings.
@ -52,6 +52,13 @@ int MenuSettings()
|
|||||||
|
|
||||||
char imgPath[100];
|
char imgPath[100];
|
||||||
|
|
||||||
|
snprintf(imgPath, sizeof(imgPath), "%ssettings_top.png", CFG.theme_path);
|
||||||
|
GuiImageData settingsTop(imgPath, settings_top_png);
|
||||||
|
|
||||||
|
snprintf(imgPath, sizeof(imgPath), "%ssettings_bottom.png", CFG.theme_path);
|
||||||
|
GuiImageData settingsBottom(imgPath, settings_bottom_png);
|
||||||
|
|
||||||
|
|
||||||
snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path);
|
snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path);
|
||||||
GuiImageData btnOutline(imgPath, button_dialogue_box_png);
|
GuiImageData btnOutline(imgPath, button_dialogue_box_png);
|
||||||
snprintf(imgPath, sizeof(imgPath), "%ssettings_background.png", CFG.theme_path);
|
snprintf(imgPath, sizeof(imgPath), "%ssettings_background.png", CFG.theme_path);
|
||||||
@ -81,6 +88,14 @@ int MenuSettings()
|
|||||||
GuiImage creditsImg(&creditsImgData);
|
GuiImage creditsImg(&creditsImgData);
|
||||||
GuiImage creditsImgOver(&creditsOver);
|
GuiImage creditsImgOver(&creditsOver);
|
||||||
|
|
||||||
|
GuiImage settingsTopImg(&settingsTop);
|
||||||
|
settingsTopImg.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
|
||||||
|
settingsTopImg.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_IN, 35);
|
||||||
|
|
||||||
|
GuiImage settingsBottomImg(&settingsBottom);
|
||||||
|
settingsBottomImg.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
|
||||||
|
settingsBottomImg.SetEffect(EFFECT_SLIDE_BOTTOM | EFFECT_SLIDE_IN, 35);
|
||||||
|
|
||||||
GuiTrigger trigA;
|
GuiTrigger trigA;
|
||||||
trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A);
|
trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A);
|
||||||
GuiTrigger trigHome;
|
GuiTrigger trigHome;
|
||||||
@ -99,6 +114,7 @@ int MenuSettings()
|
|||||||
GuiText titleTxt(LANGUAGE.settings, 28, (GXColor){0, 0, 0, 255});
|
GuiText titleTxt(LANGUAGE.settings, 28, (GXColor){0, 0, 0, 255});
|
||||||
titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
|
titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
|
||||||
titleTxt.SetPosition(0,40);
|
titleTxt.SetPosition(0,40);
|
||||||
|
titleTxt.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_IN, 35);
|
||||||
|
|
||||||
GuiImage settingsbackground(&settingsbg);
|
GuiImage settingsbackground(&settingsbg);
|
||||||
|
|
||||||
@ -112,6 +128,7 @@ int MenuSettings()
|
|||||||
GuiButton backBtn(&backBtnImg,&backBtnImg, 2, 3, -180, 400, &trigA, &btnSoundOver, &btnClick,1);
|
GuiButton backBtn(&backBtnImg,&backBtnImg, 2, 3, -180, 400, &trigA, &btnSoundOver, &btnClick,1);
|
||||||
backBtn.SetLabel(&backBtnTxt);
|
backBtn.SetLabel(&backBtnTxt);
|
||||||
backBtn.SetTrigger(&trigB);
|
backBtn.SetTrigger(&trigB);
|
||||||
|
backBtn.SetEffect(EFFECT_SLIDE_BOTTOM | EFFECT_SLIDE_IN, 35);
|
||||||
|
|
||||||
GuiButton homo(1,1);
|
GuiButton homo(1,1);
|
||||||
homo.SetTrigger(&trigHome);
|
homo.SetTrigger(&trigHome);
|
||||||
@ -279,6 +296,8 @@ int MenuSettings()
|
|||||||
mainWindow->Append(&w);
|
mainWindow->Append(&w);
|
||||||
w.RemoveAll();
|
w.RemoveAll();
|
||||||
w.Append(&settingsbackground);
|
w.Append(&settingsbackground);
|
||||||
|
w.Append(&settingsTopImg);
|
||||||
|
w.Append(&settingsBottomImg);
|
||||||
w.Append(&PageIndicatorBtn1);
|
w.Append(&PageIndicatorBtn1);
|
||||||
w.Append(&PageIndicatorBtn2);
|
w.Append(&PageIndicatorBtn2);
|
||||||
w.Append(&titleTxt);
|
w.Append(&titleTxt);
|
||||||
@ -378,6 +397,8 @@ int MenuSettings()
|
|||||||
mainWindow->Append(&w);
|
mainWindow->Append(&w);
|
||||||
w.RemoveAll();
|
w.RemoveAll();
|
||||||
w.Append(&settingsbackground);
|
w.Append(&settingsbackground);
|
||||||
|
w.Append(&settingsTopImg);
|
||||||
|
w.Append(&settingsBottomImg);
|
||||||
w.Append(&PageIndicatorBtn1);
|
w.Append(&PageIndicatorBtn1);
|
||||||
w.Append(&PageIndicatorBtn2);
|
w.Append(&PageIndicatorBtn2);
|
||||||
w.Append(&titleTxt);
|
w.Append(&titleTxt);
|
||||||
|
@ -299,9 +299,9 @@ void CFG_Default(int widescreen) // -1 = non forced Mode
|
|||||||
THEME.battery3_y = 425;
|
THEME.battery3_y = 425;
|
||||||
THEME.battery4_x = 335;
|
THEME.battery4_x = 335;
|
||||||
THEME.battery4_y = 425;
|
THEME.battery4_y = 425;
|
||||||
THEME.info_r = 63;
|
THEME.info_r = 55;
|
||||||
THEME.info_g = 154;
|
THEME.info_g = 190;
|
||||||
THEME.info_b = 192;
|
THEME.info_b = 237;
|
||||||
THEME.prompttxt_r = 0;
|
THEME.prompttxt_r = 0;
|
||||||
THEME.prompttxt_g = 0;
|
THEME.prompttxt_g = 0;
|
||||||
THEME.prompttxt_b = 0;
|
THEME.prompttxt_b = 0;
|
||||||
|
@ -11,6 +11,12 @@
|
|||||||
|
|
||||||
#include <gccore.h>
|
#include <gccore.h>
|
||||||
|
|
||||||
|
extern const u8 settings_top_png[];
|
||||||
|
extern const u32 settings_top_png_size;
|
||||||
|
|
||||||
|
extern const u8 settings_bottom_png[];
|
||||||
|
extern const u32 settings_bottom_png_size;
|
||||||
|
|
||||||
extern const u8 font_ttf[];
|
extern const u8 font_ttf[];
|
||||||
extern const u32 font_ttf_size;
|
extern const u32 font_ttf_size;
|
||||||
|
|
||||||
|
Before Width: | Height: | Size: 910 B After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 760 B After Width: | Height: | Size: 648 B |
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 6.5 KiB |
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 6.3 KiB |
Before Width: | Height: | Size: 6.6 KiB After Width: | Height: | Size: 6.5 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 8.3 KiB |
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 35 KiB |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 5.4 KiB |
BIN
source/images/settings_bottom.png
Normal file
After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 8.8 KiB |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
BIN
source/images/settings_top.png
Normal file
After Width: | Height: | Size: 7.6 KiB |
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 3.2 KiB |