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

removed MinUI-Button

This commit is contained in:
thrust26 2019-04-26 20:03:48 +02:00
parent dd09187fc0
commit 288d91dc47
2 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/OptionsDialog.cxx
View File

@ -32,7 +32,6 @@
#include "GameInfoDialog.hxx" #include "GameInfoDialog.hxx"
#include "LoggerDialog.hxx" #include "LoggerDialog.hxx"
#include "DeveloperDialog.hxx" #include "DeveloperDialog.hxx"
#include "StellaSettingsDialog.hxx"
#include "HelpDialog.hxx" #include "HelpDialog.hxx"
#include "AboutDialog.hxx" #include "AboutDialog.hxx"
#include "OptionsDialog.hxx" #include "OptionsDialog.hxx"
@ -51,10 +50,10 @@ OptionsDialog::OptionsDialog(OSystem& osystem, DialogContainer& parent,
: Dialog(osystem, parent, osystem.frameBuffer().font(), "Options"), : Dialog(osystem, parent, osystem.frameBuffer().font(), "Options"),
myMode(mode) myMode(mode)
{ {
const int buttonWidth = _font.getStringWidth("Game Properties" + ELLIPSIS) + 20, const int buttonHeight = _font.getLineHeight() + 6,
buttonHeight = _font.getLineHeight() + 6,
rowHeight = _font.getLineHeight() + 10; rowHeight = _font.getLineHeight() + 10;
const int VBORDER = 10 + _th; const int VBORDER = 10 + _th;
int buttonWidth = _font.getStringWidth("Game Properties" + ELLIPSIS) + 20;
_w = 2 * buttonWidth + 30; _w = 2 * buttonWidth + 30;
_h = 7 * rowHeight + 15 + _th; _h = 7 * rowHeight + 15 + _th;
@ -90,11 +89,6 @@ OptionsDialog::OptionsDialog(OSystem& osystem, DialogContainer& parent,
wid.push_back(b); wid.push_back(b);
//yoffset += rowHeight; //yoffset += rowHeight;
// R77 TEST
b = ADD_OD_BUTTON("Stella Options" + ELLIPSIS, kStellaOptionsCmd);
wid.push_back(b);
b = ADD_OD_BUTTON("Developer" + ELLIPSIS, kDevelopCmd); b = ADD_OD_BUTTON("Developer" + ELLIPSIS, kDevelopCmd);
wid.push_back(b); wid.push_back(b);
@ -122,6 +116,8 @@ OptionsDialog::OptionsDialog(OSystem& osystem, DialogContainer& parent,
b = ADD_OD_BUTTON("About" + ELLIPSIS, kAboutCmd); b = ADD_OD_BUTTON("About" + ELLIPSIS, kAboutCmd);
wid.push_back(b); wid.push_back(b);
buttonWidth = _font.getStringWidth(" Close ") + 20,
xoffset -= (buttonWidth + 10) / 2;
b = ADD_OD_BUTTON("Close", kExitCmd); b = ADD_OD_BUTTON("Close", kExitCmd);
wid.push_back(b); wid.push_back(b);
addCancelWidget(b); addCancelWidget(b);
@ -132,7 +128,6 @@ OptionsDialog::OptionsDialog(OSystem& osystem, DialogContainer& parent,
myInputDialog = make_unique<InputDialog>(osystem, parent, _font, max_w, max_h); myInputDialog = make_unique<InputDialog>(osystem, parent, _font, max_w, max_h);
myUIDialog = make_unique<UIDialog>(osystem, parent, _font, boss, max_w, max_h); myUIDialog = make_unique<UIDialog>(osystem, parent, _font, boss, max_w, max_h);
mySnapshotDialog = make_unique<SnapshotDialog>(osystem, parent, _font, max_w, max_h); mySnapshotDialog = make_unique<SnapshotDialog>(osystem, parent, _font, max_w, max_h);
myStellaOptionsDialog = make_unique<StellaSettingsDialog>(osystem, parent, _font, max_w, max_h);
myDeveloperDialog = make_unique<DeveloperDialog>(osystem, parent, _font, max_w, max_h); myDeveloperDialog = make_unique<DeveloperDialog>(osystem, parent, _font, max_w, max_h);
myGameInfoDialog = make_unique<GameInfoDialog>(osystem, parent, _font, this, max_w, max_h); myGameInfoDialog = make_unique<GameInfoDialog>(osystem, parent, _font, this, max_w, max_h);
#ifdef CHEATCODE_SUPPORT #ifdef CHEATCODE_SUPPORT
@ -257,21 +252,6 @@ void OptionsDialog::handleCommand(CommandSender* sender, int cmd,
break; break;
} }
case kStellaOptionsCmd:
{
// This dialog is resizable under certain conditions, so we need
// to re-create it as necessary
uInt32 w = 0, h = 0;
if (myStellaOptionsDialog == nullptr || myStellaOptionsDialog->shouldResize(w, h))
{
myStellaOptionsDialog = make_unique<StellaSettingsDialog>(instance(), parent(),
instance().frameBuffer().font(), w, h);
}
myStellaOptionsDialog->open();
break;
}
case kInfoCmd: case kInfoCmd:
{ {
// This dialog is resizable under certain conditions, so we need // This dialog is resizable under certain conditions, so we need

6
src/gui/OptionsDialog.hxx
View File

@ -35,12 +35,10 @@ class RomAuditDialog;
class HelpDialog; class HelpDialog;
class AboutDialog; class AboutDialog;
class LoggerDialog; class LoggerDialog;
class DeveloperDialog;
#include "Dialog.hxx" #include "Dialog.hxx"
class DeveloperDialog;
class StellaSettingsDialog;
class OptionsDialog : public Dialog class OptionsDialog : public Dialog
{ {
public: public:
@ -62,7 +60,6 @@ class OptionsDialog : public Dialog
unique_ptr<UIDialog> myUIDialog; unique_ptr<UIDialog> myUIDialog;
unique_ptr<SnapshotDialog> mySnapshotDialog; unique_ptr<SnapshotDialog> mySnapshotDialog;
unique_ptr<DeveloperDialog> myDeveloperDialog; unique_ptr<DeveloperDialog> myDeveloperDialog;
unique_ptr<StellaSettingsDialog> myStellaOptionsDialog;
unique_ptr<GameInfoDialog> myGameInfoDialog; unique_ptr<GameInfoDialog> myGameInfoDialog;
#ifdef CHEATCODE_SUPPORT #ifdef CHEATCODE_SUPPORT
unique_ptr<CheatCodeDialog> myCheatCodeDialog; unique_ptr<CheatCodeDialog> myCheatCodeDialog;
@ -90,7 +87,6 @@ class OptionsDialog : public Dialog
kCheatCmd = 'CHET', kCheatCmd = 'CHET',
kLoggerCmd = 'LOGG', kLoggerCmd = 'LOGG',
kDevelopCmd = 'DEVL', kDevelopCmd = 'DEVL',
kStellaOptionsCmd = 'STOP',
kHelpCmd = 'HELP', kHelpCmd = 'HELP',
kAboutCmd = 'ABOU', kAboutCmd = 'ABOU',
kExitCmd = 'EXIM' kExitCmd = 'EXIM'