diff --git a/src/gui/ConfigPathDialog.cxx b/src/gui/ConfigPathDialog.cxx index 272a0689f..90c4ab7b7 100644 --- a/src/gui/ConfigPathDialog.cxx +++ b/src/gui/ConfigPathDialog.cxx @@ -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(this, myFont, r.width()*0.95, r.height()*0.95, title); + myBrowser = make_unique(this, myFont, w, h, title); else myBrowser->setTitle(title); } diff --git a/src/gui/LoggerDialog.cxx b/src/gui/LoggerDialog.cxx index 35b6cf4c6..18fb3b913 100644 --- a/src/gui/LoggerDialog.cxx +++ b/src/gui/LoggerDialog.cxx @@ -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; diff --git a/src/gui/OptionsDialog.cxx b/src/gui/OptionsDialog.cxx index afcbde585..584e414b0 100644 --- a/src/gui/OptionsDialog.cxx +++ b/src/gui/OptionsDialog.cxx @@ -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(instance(), parent(), - instance().frameBuffer().font(), r.width(), r.height(), uselargefont); + instance().frameBuffer().font(), w, h, uselargefont); } myLoggerDialog->open(); break; diff --git a/src/gui/SnapshotDialog.cxx b/src/gui/SnapshotDialog.cxx index 40c9a0a6d..96525c7b3 100644 --- a/src/gui/SnapshotDialog.cxx +++ b/src/gui/SnapshotDialog.cxx @@ -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(this, myFont, r.width()*0.95, r.height()*0.95, title); + myBrowser = make_unique(this, myFont, w, h, title); else myBrowser->setTitle(title); } diff --git a/src/gui/UIDialog.cxx b/src/gui/UIDialog.cxx index 1a7f56ebf..7ca574954 100644 --- a/src/gui/UIDialog.cxx +++ b/src/gui/UIDialog.cxx @@ -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(this, myFont, r.width()*0.95, r.height()*0.95, title); + myBrowser = make_unique(this, myFont, w, h, title); else myBrowser->setTitle(title); }