ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/6.0' of https://github.com/stella-emu/stella into release/6.0

This commit is contained in:
thrust26 2018-08-17 21:02:42 +02:00
parent f12c4bb485 c05fa1989f
commit 810b854428
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/UIDialog.cxx
View File

@ -38,7 +38,7 @@
UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
const GUI::Font& font) const GUI::Font& font)
: Dialog(osystem, parent, font, "User interface settings"), : Dialog(osystem, parent, font, "User interface settings"),
myFont(font) myFont(font)
{ {
const GUI::Font& ifont = instance().frameBuffer().infoFont(); const GUI::Font& ifont = instance().frameBuffer().infoFont();
const int lineHeight = font.getLineHeight(), const int lineHeight = font.getLineHeight(),
@ -195,6 +195,11 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
addBGroupToFocusList(wid); addBGroupToFocusList(wid);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UIDialog::~UIDialog()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void UIDialog::loadConfig() void UIDialog::loadConfig()
{ {

2
src/gui/UIDialog.hxx
View File

@ -35,7 +35,7 @@ class UIDialog : public Dialog
{ {
public: public:
UIDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font); UIDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font);
virtual ~UIDialog() = default; virtual ~UIDialog();
private: private:
void loadConfig() override; void loadConfig() override;