mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2024-11-22 14:15:38 +00:00
Fixed multiple issues where menu sizes were not properly initialized.
This commit is contained in:
parent
0cf52c2d71
commit
593cfdbdd7
|
@ -593,6 +593,7 @@ void GuiMenu::openUIOptions()
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
s->setSize(mSize);
|
||||||
mWindow->pushGui(s);
|
mWindow->pushGui(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -700,6 +701,7 @@ void GuiMenu::openSoundOptions()
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
s->setSize(mSize);
|
||||||
mWindow->pushGui(s);
|
mWindow->pushGui(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -756,6 +758,7 @@ void GuiMenu::openInputDeviceOptions()
|
||||||
configure_input_row.makeAcceptInputHandler(std::bind(&GuiMenu::openConfigInput, this, s));
|
configure_input_row.makeAcceptInputHandler(std::bind(&GuiMenu::openConfigInput, this, s));
|
||||||
s->addRow(configure_input_row);
|
s->addRow(configure_input_row);
|
||||||
|
|
||||||
|
s->setSize(mSize);
|
||||||
mWindow->pushGui(s);
|
mWindow->pushGui(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1180,12 +1183,14 @@ void GuiMenu::openOtherOptions()
|
||||||
run_in_background->setCallback(launchWorkaroundToggleFunc);
|
run_in_background->setCallback(launchWorkaroundToggleFunc);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
s->setSize(mSize);
|
||||||
mWindow->pushGui(s);
|
mWindow->pushGui(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GuiMenu::openUtilitiesMenu()
|
void GuiMenu::openUtilitiesMenu()
|
||||||
{
|
{
|
||||||
auto s = new GuiSettings(mWindow, "UTILITIES");
|
auto s = new GuiSettings(mWindow, "UTILITIES");
|
||||||
|
s->setSize(mSize);
|
||||||
mWindow->pushGui(s);
|
mWindow->pushGui(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1263,6 +1268,7 @@ void GuiMenu::openQuitMenu()
|
||||||
row.addElement(powerOffText, true);
|
row.addElement(powerOffText, true);
|
||||||
s->addRow(row);
|
s->addRow(row);
|
||||||
|
|
||||||
|
s->setSize(mSize);
|
||||||
mWindow->pushGui(s);
|
mWindow->pushGui(s);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
|
|
||||||
GuiScreensaverOptions::GuiScreensaverOptions(Window* window, const std::string& title)
|
GuiScreensaverOptions::GuiScreensaverOptions(Window* window, const std::string& title)
|
||||||
: GuiSettings(window, title)
|
: GuiSettings(window, title)
|
||||||
|
, mWindow(window)
|
||||||
{
|
{
|
||||||
// Screensaver timer.
|
// Screensaver timer.
|
||||||
auto screensaver_timer = std::make_shared<SliderComponent>(mWindow, 0.0f, 30.0f, 1.0f, "m");
|
auto screensaver_timer = std::make_shared<SliderComponent>(mWindow, 0.0f, 30.0f, 1.0f, "m");
|
||||||
|
@ -95,6 +96,8 @@ GuiScreensaverOptions::GuiScreensaverOptions(Window* window, const std::string&
|
||||||
row.makeAcceptInputHandler(
|
row.makeAcceptInputHandler(
|
||||||
std::bind(&GuiScreensaverOptions::openVideoScreensaverOptions, this));
|
std::bind(&GuiScreensaverOptions::openVideoScreensaverOptions, this));
|
||||||
addRow(row);
|
addRow(row);
|
||||||
|
|
||||||
|
setSize(getMenuSize());
|
||||||
}
|
}
|
||||||
|
|
||||||
void GuiScreensaverOptions::openSlideshowScreensaverOptions()
|
void GuiScreensaverOptions::openSlideshowScreensaverOptions()
|
||||||
|
@ -206,6 +209,7 @@ void GuiScreensaverOptions::openSlideshowScreensaverOptions()
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
s->setSize(mSize);
|
||||||
mWindow->pushGui(s);
|
mWindow->pushGui(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -287,5 +291,6 @@ void GuiScreensaverOptions::openVideoScreensaverOptions()
|
||||||
});
|
});
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
s->setSize(mSize);
|
||||||
mWindow->pushGui(s);
|
mWindow->pushGui(s);
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,6 +18,8 @@ public:
|
||||||
GuiScreensaverOptions(Window* window, const std::string& title);
|
GuiScreensaverOptions(Window* window, const std::string& title);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
Window* mWindow;
|
||||||
|
|
||||||
void openSlideshowScreensaverOptions();
|
void openSlideshowScreensaverOptions();
|
||||||
void openVideoScreensaverOptions();
|
void openVideoScreensaverOptions();
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue