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

Revert "fixed #367" 

This reverts commit 79fd588f8a.
This commit is contained in:
thrust26 2018-08-29 15:37:10 +02:00
parent e9a6deee70
commit dc630b4dd6
5 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/ConfigPathDialog.cxx
View File

@ -23,7 +23,6 @@
#include "LauncherDialog.hxx"
#include "PopUpWidget.hxx"
#include "Settings.hxx"
#include "FrameBuffer.hxx"
#include "ConfigPathDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -293,12 +292,11 @@ void ConfigPathDialog::createBrowser(const string& title)
{
uInt32 w = 0, h = 0;
getResizableBounds(w, h);
const GUI::Rect& r = instance().frameBuffer().imageRect();
// Create file browser dialog
if(!myBrowser || uInt32(myBrowser->getWidth()) != w ||
uInt32(myBrowser->getHeight()) != h)
myBrowser = make_unique<BrowserDialog>(this, myFont, r.width()*0.95, r.height()*0.95, title);
myBrowser = make_unique<BrowserDialog>(this, myFont, w, h, title);
else
myBrowser->setTitle(title);
}

6
src/gui/LoggerDialog.cxx
View File

@ -43,9 +43,9 @@ LoggerDialog::LoggerDialog(OSystem& osystem, DialogContainer& parent,
WidgetArray wid;
// Set real dimensions
// This is one dialog that can take as much space as is available, use 95%
_w = max_w * 0.95;
_h = max_h * 0.95;
// This is one dialog that can take as much space as is available
_w = max_w;
_h = max_h;
// Test listing of the log output
xpos = 10; ypos = 10 + _th;

3
src/gui/OptionsDialog.cxx
View File

@ -260,10 +260,9 @@ void OptionsDialog::handleCommand(CommandSender* sender, int cmd,
{
uInt32 w = 0, h = 0;
bool uselargefont = getResizableBounds(w, h);
const GUI::Rect& r = instance().frameBuffer().imageRect();
myLoggerDialog = make_unique<LoggerDialog>(instance(), parent(),
instance().frameBuffer().font(), r.width(), r.height(), uselargefont);
instance().frameBuffer().font(), w, h, uselargefont);
}
myLoggerDialog->open();
break;

4
src/gui/SnapshotDialog.cxx
View File

@ -22,7 +22,6 @@
#include "Font.hxx"
#include "LauncherDialog.hxx"
#include "Settings.hxx"
#include "FrameBuffer.hxx"
#include "SnapshotDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -182,12 +181,11 @@ void SnapshotDialog::createBrowser(const string& title)
{
uInt32 w = 0, h = 0;
getResizableBounds(w, h);
const GUI::Rect& r = instance().frameBuffer().imageRect();
// Create file browser dialog
if(!myBrowser || uInt32(myBrowser->getWidth()) != w ||
uInt32(myBrowser->getHeight()) != h)
myBrowser = make_unique<BrowserDialog>(this, myFont, r.width()*0.95, r.height()*0.95, title);
myBrowser = make_unique<BrowserDialog>(this, myFont, w, h, title);
else
myBrowser->setTitle(title);
}

3
src/gui/UIDialog.cxx
View File

@ -397,12 +397,11 @@ void UIDialog::createBrowser(const string& title)
{
uInt32 w = 0, h = 0;
getResizableBounds(w, h);
const GUI::Rect& r = instance().frameBuffer().imageRect();
// Create file browser dialog
if(!myBrowser || uInt32(myBrowser->getWidth()) != w ||
uInt32(myBrowser->getHeight()) != h)
myBrowser = make_unique<BrowserDialog>(this, myFont, r.width()*0.95, r.height()*0.95, title);
myBrowser = make_unique<BrowserDialog>(this, myFont, w, h, title);
else
myBrowser->setTitle(title);
}