piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-25 15:19:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

* remember screen rotation/gap/etc settings

Browse Source 
* fix menu cleanup to take submenus into account properly, so it doesn't crash when exiting
This commit is contained in:
StapleButter
2017-11-23 21:02:24 +01:00
parent aa4f427ed4
commit 85c375cce7
4 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libui_sdl/libui/windows/menu.cpp
View File

@ -14,6 +14,7 @@ static BOOL hasAbout = FALSE;
struct uiMenu {
WCHAR *name;
HMENU handle;
uiMenuItem **items;
BOOL ischild;
size_t len;
@ -292,6 +293,7 @@ static HMENU makeMenu(uiMenu *m)
menu = CreatePopupMenu();
if (menu == NULL)
logLastError(L"error creating menu");
m->handle = menu;
for (i = 0; i < m->len; i++)
appendMenuItem(menu, m->items[i]);
return menu;
@ -363,21 +365,28 @@ static void freeMenu(uiMenu *m, HMENU submenu)
item->hmenus[j] = item->hmenus[j + 1];
item->hmenus[j] = NULL;
item->len--;
if (item->popupchild)
freeMenu(item->popupchild, item->popupchild->handle);
}
}
void freeMenubar(HMENU menubar)
{
size_t i;
size_t j = 0;
MENUITEMINFOW mi;
for (i = 0; i < len; i++) {
for (i = 0; i < len; i++)
{
if (menus[i]->ischild) continue;
ZeroMemory(&mi, sizeof (MENUITEMINFOW));
mi.cbSize = sizeof (MENUITEMINFOW);
mi.fMask = MIIM_SUBMENU;
if (GetMenuItemInfoW(menubar, i, TRUE, &mi) == 0)
if (GetMenuItemInfoW(menubar, j, TRUE, &mi) == 0)
logLastError(L"error getting menu to delete item references from");
freeMenu(menus[i], mi.hSubMenu);
j++;
}
// no need to worry about destroying any menus; destruction of the window they're in will do it for us
}
@ -396,7 +405,7 @@ void uninitMenus(void)
if (item->len != 0)
// LONGTERM userbug()?
implbug("menu item %p (%ws) still has uiWindows attached; did you forget to destroy some windows?", item, item->name);
if (item->name != NULL)
if (item->type != typeSubmenu && item->name != NULL)
uiFree(item->name);
if (item->hmenus != NULL)
uiFree(item->hmenus);

21
src/libui_sdl/main.cpp
View File

@ -865,6 +865,8 @@ void OnSetScreenRotation(uiMenuItem* item, uiWindow* window, void* param)
w = blarg;
uiWindowSetContentSize(window, w, h);
Config::WindowWidth = w;
Config::WindowHeight = h;
}
}
else if (ScreenLayout == 1) // vertical
@ -1139,6 +1141,20 @@ int main(int argc, char** argv)
uiControlSetMinSize(uiControl(MainDrawArea), 256, 384);
uiAreaSetBackgroundColor(MainDrawArea, 0, 0, 0); // TODO: make configurable?
ScreenRotation = Config::ScreenRotation;
ScreenGap = Config::ScreenGap;
ScreenLayout = Config::ScreenLayout;
ScreenSizing = Config::ScreenSizing;
#define SANITIZE(var, min, max) if ((var < min) || (var > max)) var = 0;
SANITIZE(ScreenRotation, 0, 3);
SANITIZE(ScreenGap, 0, 5);
SANITIZE(ScreenLayout, 0, 2);
SANITIZE(ScreenSizing, 0, 3);
#undef SANITIZE
OnSetScreenRotation(MenuItem_ScreenRot[ScreenRotation], MainWindow, (void*)&kScreenRot[ScreenRotation]);
EmuRunning = 2;
RunningSomething = false;
EmuThread = SDL_CreateThread(EmuThreadFunc, "melonDS magic", NULL);
@ -1165,6 +1181,11 @@ int main(int argc, char** argv)
EmuRunning = 0;
SDL_WaitThread(EmuThread, NULL);
Config::ScreenRotation = ScreenRotation;
Config::ScreenGap = ScreenGap;
Config::ScreenLayout = ScreenLayout;
Config::ScreenSizing = ScreenSizing;
Config::Save();
if (ScreenBitmap) uiDrawFreeBitmap(ScreenBitmap);