diff options
Diffstat (limited to 'gui')
-rw-r--r-- | gui/debugger.cpp | 4 | ||||
-rw-r--r-- | gui/downloaddialog.cpp | 4 | ||||
-rw-r--r-- | gui/downloaddialog.h | 2 | ||||
-rw-r--r-- | gui/options.cpp | 10 | ||||
-rw-r--r-- | gui/remotebrowser.cpp | 4 | ||||
-rw-r--r-- | gui/saveload-dialog.cpp | 8 | ||||
-rw-r--r-- | gui/saveload-dialog.h | 8 | ||||
-rw-r--r-- | gui/storagewizarddialog.cpp | 14 | ||||
-rw-r--r-- | gui/themes/scummclassic/classic_gfx.stx | 40 | ||||
-rw-r--r-- | gui/themes/scummclassic/classic_layout.stx | 10 | ||||
-rw-r--r-- | gui/themes/scummclassic/classic_layout_lowres.stx | 10 | ||||
-rw-r--r-- | gui/themes/scummmodern/scummmodern_gfx.stx | 46 | ||||
-rw-r--r-- | gui/themes/scummmodern/scummmodern_layout.stx | 10 | ||||
-rw-r--r-- | gui/themes/scummmodern/scummmodern_layout_lowres.stx | 10 | ||||
-rw-r--r-- | gui/widgets/scrollcontainer.cpp | 4 |
15 files changed, 92 insertions, 92 deletions
diff --git a/gui/debugger.cpp b/gui/debugger.cpp index 72d05e2973..7595efcfbc 100644 --- a/gui/debugger.cpp +++ b/gui/debugger.cpp @@ -584,7 +584,7 @@ bool Debugger::cmdMd5(int argc, const char **argv) { length = atoi(argv[2]); paramOffset = 2; } - + // Assume that spaces are part of a single filename. Common::String filename = argv[1 + paramOffset]; for (int i = 2 + paramOffset; i < argc; i++) { @@ -624,7 +624,7 @@ bool Debugger::cmdMd5Mac(int argc, const char **argv) { length = atoi(argv[2]); paramOffset = 2; } - + // Assume that spaces are part of a single filename. Common::String filename = argv[1 + paramOffset]; for (int i = 2 + paramOffset; i < argc; i++) { diff --git a/gui/downloaddialog.cpp b/gui/downloaddialog.cpp index df8783736e..a90783de9e 100644 --- a/gui/downloaddialog.cpp +++ b/gui/downloaddialog.cpp @@ -119,7 +119,7 @@ bool DownloadDialog::selectDirectories() { if (alert.runModal() != GUI::kMessageOK) return false; } - //first user should select remote directory to download + //first user should select remote directory to download if (_remoteBrowser->runModal() <= 0) return false; Cloud::StorageFile remoteDirectory = _remoteBrowser->getResult(); @@ -248,7 +248,7 @@ Common::String DownloadDialog::getSpeedLabelText() { return Common::String::format("Download speed: %s %s", speed.c_str(), _(speedUnits.c_str())); } -void DownloadDialog::refreshWidgets() { +void DownloadDialog::refreshWidgets() { _localDirectory = CloudMan.getDownloadLocalDirectory(); _remoteDirectoryLabel->setLabel(_("From: ") + CloudMan.getDownloadRemoteDirectory()); _localDirectoryLabel->setLabel(_("To: ") + _localDirectory); diff --git a/gui/downloaddialog.h b/gui/downloaddialog.h index cbeb78ab66..9080717195 100644 --- a/gui/downloaddialog.h +++ b/gui/downloaddialog.h @@ -46,7 +46,7 @@ class DownloadDialog : public Dialog { LauncherDialog *_launcher; BrowserDialog *_browser; RemoteBrowserDialog *_remoteBrowser; - + StaticTextWidget *_remoteDirectoryLabel; StaticTextWidget *_localDirectoryLabel; StaticTextWidget *_percentLabel; diff --git a/gui/options.cpp b/gui/options.cpp index abc97aa00e..ee7e584e1c 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -1779,7 +1779,7 @@ void GlobalOptionsDialog::setupCloudTab() { int serverLabelPosition = -1; //no override #ifdef USE_LIBCURL _selectedStorageIndex = _storagePopUp->getSelectedTag(); - + if (_storagePopUpDesc) _storagePopUpDesc->setVisible(true); if (_storagePopUp) _storagePopUp->setVisible(true); @@ -1813,7 +1813,7 @@ void GlobalOptionsDialog::setupCloudTab() { if (!shown) serverLabelPosition = (_storageUsernameDesc ? _storageUsernameDesc->getRelY() : 0); #else _selectedStorageIndex = 0; - + if (_storagePopUpDesc) _storagePopUpDesc->setVisible(false); if (_storagePopUp) _storagePopUp->setVisible(false); if (_storageUsernameDesc) _storageUsernameDesc->setVisible(false); @@ -1822,7 +1822,7 @@ void GlobalOptionsDialog::setupCloudTab() { if (_storageUsedSpaceDesc) _storageUsedSpaceDesc->setVisible(false); if (_storageUsedSpace) _storageUsedSpace->setVisible(false); if (_storageLastSyncDesc) _storageLastSyncDesc->setVisible(false); - if (_storageLastSync) _storageLastSync->setVisible(false); + if (_storageLastSync) _storageLastSync->setVisible(false); if (_storageConnectButton) _storageConnectButton->setVisible(false); if (_storageRefreshButton) _storageRefreshButton->setVisible(false); if (_storageDownloadButton) _storageDownloadButton->setVisible(false); @@ -1851,7 +1851,7 @@ void GlobalOptionsDialog::setupCloudTab() { serverPortClearButtonY = y; bool serverIsRunning = LocalServer.isRunning(); - + if (serverLabelPosition < 0) serverLabelPosition = serverInfoY; if (_runServerButton) { _runServerButton->setVisible(true); @@ -1907,7 +1907,7 @@ void GlobalOptionsDialog::storageListDirectoryCallback(Cloud::Storage::ListDirec uint64 totalSize = 0; for (uint32 i = 0; i < files.size(); ++i) if (!files[i].isDirectory()) - totalSize += files[i].size(); + totalSize += files[i].size(); CloudMan.setStorageUsedSpace(CloudMan.getStorageIndex(), totalSize); _redrawCloudTab = true; } diff --git a/gui/remotebrowser.cpp b/gui/remotebrowser.cpp index d176d29b02..49f35edc16 100644 --- a/gui/remotebrowser.cpp +++ b/gui/remotebrowser.cpp @@ -67,7 +67,7 @@ RemoteBrowserDialog::~RemoteBrowserDialog() { } } -void RemoteBrowserDialog::open() { +void RemoteBrowserDialog::open() { Dialog::open(); listDirectory(Cloud::StorageFile()); } @@ -176,7 +176,7 @@ void RemoteBrowserDialog::goUp() { if (i == 0 || path[i] == '/' || path[i] == '\\') { path.erase(i); break; - } + } } listDirectory(Cloud::StorageFile(path, 0, 0, true)); diff --git a/gui/saveload-dialog.cpp b/gui/saveload-dialog.cpp index 222f637872..0a39f59cd6 100644 --- a/gui/saveload-dialog.cpp +++ b/gui/saveload-dialog.cpp @@ -57,7 +57,7 @@ SaveLoadCloudSyncProgressDialog::SaveLoadCloudSyncProgressDialog(bool canRunInBa _progressBar->setValue(progress); _progressBar->setEnabled(false); _percentLabel = new StaticTextWidget(this, "SaveLoadCloudSyncProgress.PercentText", Common::String::format("%u %%", progress)); - new ButtonWidget(this, "SaveLoadCloudSyncProgress.Cancel", "Cancel", 0, kCancelSyncCmd, Common::ASCII_ESCAPE); // Cancel dialog + new ButtonWidget(this, "SaveLoadCloudSyncProgress.Cancel", "Cancel", 0, kCancelSyncCmd, Common::ASCII_ESCAPE); // Cancel dialog ButtonWidget *backgroundButton = new ButtonWidget(this, "SaveLoadCloudSyncProgress.Background", "Run in background", 0, kBackgroundSyncCmd, Common::ASCII_RETURN); // Confirm dialog backgroundButton->setEnabled(canRunInBackground); draw(); @@ -69,7 +69,7 @@ SaveLoadCloudSyncProgressDialog::~SaveLoadCloudSyncProgressDialog() { void SaveLoadCloudSyncProgressDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { switch(cmd) { - case kSavesSyncProgressCmd: + case kSavesSyncProgressCmd: _percentLabel->setLabel(Common::String::format("%u%%", data)); _progressBar->setValue(data); _progressBar->draw(); @@ -280,7 +280,7 @@ void SaveLoadChooserDialog::reflowLayout() { void SaveLoadChooserDialog::updateSaveList() { #ifdef USE_LIBCURL - Common::Array<Common::String> files = CloudMan.getSyncingFiles(); //returns empty array if not syncing + Common::Array<Common::String> files = CloudMan.getSyncingFiles(); //returns empty array if not syncing g_system->getSavefileManager()->updateSavefilesList(files); #endif listSaves(); @@ -300,7 +300,7 @@ void SaveLoadChooserDialog::listSaves() { //make up some slot number int slotNum = 0; - for (uint32 j = (files[i].size() > 3 ? files[i].size() - 3 : 0); j < files[i].size(); ++j) { //3 last chars + for (uint32 j = (files[i].size() > 3 ? files[i].size() - 3 : 0); j < files[i].size(); ++j) { //3 last chars char c = files[i][j]; if (c < '0' || c > '9') continue; slotNum = slotNum * 10 + (c - '0'); diff --git a/gui/saveload-dialog.h b/gui/saveload-dialog.h index 4e375bfc2e..fb2833355f 100644 --- a/gui/saveload-dialog.h +++ b/gui/saveload-dialog.h @@ -84,7 +84,7 @@ public: #ifdef USE_LIBCURL virtual void runSaveSync(bool hasSavepathOverride); #endif - + virtual void handleTickle(); #ifndef DISABLE_SAVELOADCHOOSER_GRID @@ -148,8 +148,8 @@ public: virtual void open(); virtual void close(); -protected: - virtual void updateSaveList(); +protected: + virtual void updateSaveList(); private: virtual int runIntern(); @@ -163,7 +163,7 @@ private: StaticTextWidget *_playtime; String _resultString; - + void updateSelection(bool redraw); }; diff --git a/gui/storagewizarddialog.cpp b/gui/storagewizarddialog.cpp index 299da11812..b411a2e0dc 100644 --- a/gui/storagewizarddialog.cpp +++ b/gui/storagewizarddialog.cpp @@ -46,7 +46,7 @@ StorageWizardDialog::StorageWizardDialog(uint32 storageId): Common::String headline = Common::String::format(_("%s Storage Connection Wizard"), CloudMan.listStorages()[_storageId].c_str()); new StaticTextWidget(this, "GlobalOptions_Cloud_ConnectionWizard.Headline", headline); - + new StaticTextWidget(this, "GlobalOptions_Cloud_ConnectionWizard.NavigateLine", _s("Navigate to the following URL:")); new StaticTextWidget(this, "GlobalOptions_Cloud_ConnectionWizard.URLLine", getUrl()); @@ -114,7 +114,7 @@ void StorageWizardDialog::close() { void StorageWizardDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { switch (cmd) { - case kCodeBoxCmd: { + case kCodeBoxCmd: { Common::String code, message; uint32 correctFields = 0; for (uint32 i = 0; i < CODE_FIELDS; ++i) { @@ -184,7 +184,7 @@ void StorageWizardDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3 } case kStorageCodePassedCmd: CloudMan.connectStorage(_storageId, LocalServer.indexPageHandler().code()); - _close = true; + _close = true; break; default: Dialog::handleCommand(sender, cmd, data); @@ -208,7 +208,7 @@ Common::String StorageWizardDialog::getUrl() const { case Cloud::kStorageGoogleDriveId: url += "gd"; break; case Cloud::kStorageBoxId: url += "bx"; break; } - + if (couldUseLocalServer()) url += "s"; return url; } @@ -222,7 +222,7 @@ bool StorageWizardDialog::couldUseLocalServer() const { } int StorageWizardDialog::decodeHashchar(char c) { - const char HASHCHARS[65] = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ?!"; + const char HASHCHARS[65] = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ?!"; for (uint32 i = 0; i < 64; ++i) if (c == HASHCHARS[i]) return i; @@ -232,10 +232,10 @@ int StorageWizardDialog::decodeHashchar(char c) { bool StorageWizardDialog::correctChecksum(Common::String s) { if (s.size() == 0) return false; //no last char int providedChecksum = decodeHashchar(s.lastChar()); - int calculatedChecksum = 0x2A; //any initial value would do, but it must equal to the one used on the page where these checksums were generated + int calculatedChecksum = 0x2A; //any initial value would do, but it must equal to the one used on the page where these checksums were generated for (uint32 i = 0; i < s.size()-1; ++i) { calculatedChecksum = calculatedChecksum ^ s[i]; - } + } return providedChecksum == (calculatedChecksum % 64); } diff --git a/gui/themes/scummclassic/classic_gfx.stx b/gui/themes/scummclassic/classic_gfx.stx index 49ecea2e11..1311345621 100644 --- a/gui/themes/scummclassic/classic_gfx.stx +++ b/gui/themes/scummclassic/classic_gfx.stx @@ -192,7 +192,7 @@ orientation = 'top' /> </drawdata> - + <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y<400'> <drawstep func = 'bevelsq' bevel = '2' @@ -226,7 +226,7 @@ orientation = 'top' /> </drawdata> - + <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y<400'> <drawstep func = 'bevelsq' bevel = '2' @@ -314,7 +314,7 @@ bevel = '2' fill = 'none' /> - + <drawstep func = 'triangle' fg_color = 'green' fill = 'foreground' @@ -325,7 +325,7 @@ padding = '0, 0, 7, 0' orientation = 'bottom' /> - + <drawstep func = 'triangle' fg_color = 'green' fill = 'foreground' @@ -336,20 +336,20 @@ padding = '0, 0, 7, 0' orientation = 'top' /> - + <text font = 'text_default' text_color = 'color_normal' vertical_align = 'center' horizontal_align = 'left' /> </drawdata> - + <drawdata id = 'popup_idle' cache = 'false' resolution = 'y<400'> <drawstep func = 'bevelsq' bevel = '2' fill = 'none' /> - + <drawstep func = 'triangle' fg_color = 'green' fill = 'foreground' @@ -360,7 +360,7 @@ padding = '0, 0, 3, 0' orientation = 'bottom' /> - + <drawstep func = 'triangle' fg_color = 'green' fill = 'foreground' @@ -371,7 +371,7 @@ padding = '0, 0, 3, 0' orientation = 'top' /> - + <text font = 'text_default' text_color = 'color_normal' vertical_align = 'center' @@ -394,7 +394,7 @@ padding = '0, 0, 7, 0' orientation = 'bottom' /> - + <drawstep func = 'triangle' fg_color = 'green' fill = 'foreground' @@ -411,13 +411,13 @@ horizontal_align = 'left' /> </drawdata> - + <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y<400'> <drawstep func = 'bevelsq' bevel = '2' fill = 'none' /> - + <drawstep func = 'triangle' fg_color = 'green' fill = 'foreground' @@ -428,7 +428,7 @@ padding = '0, 0, 3, 0' orientation = 'bottom' /> - + <drawstep func = 'triangle' fg_color = 'green' fill = 'foreground' @@ -439,7 +439,7 @@ padding = '0, 0, 3, 0' orientation = 'top' /> - + <text font = 'text_default' text_color = 'color_normal' vertical_align = 'center' @@ -462,7 +462,7 @@ padding = '0, 0, 7, 0' orientation = 'bottom' /> - + <drawstep func = 'triangle' fg_color = 'green' fill = 'foreground' @@ -479,13 +479,13 @@ horizontal_align = 'left' /> </drawdata> - + <drawdata id = 'popup_hover' cache = 'false' resolution = 'y<400'> <drawstep func = 'bevelsq' bevel = '2' fill = 'none' /> - + <drawstep func = 'triangle' fg_color = 'green' fill = 'foreground' @@ -496,7 +496,7 @@ padding = '0, 0, 3, 0' orientation = 'bottom' /> - + <drawstep func = 'triangle' fg_color = 'green' fill = 'foreground' @@ -507,7 +507,7 @@ padding = '0, 0, 3, 0' orientation = 'top' /> - + <text font = 'text_default' text_color = 'color_normal' vertical_align = 'center' @@ -552,7 +552,7 @@ fill = 'foreground' fg_color = 'green' /> - </drawdata> + </drawdata> <drawdata id = 'button_idle' cache = 'false'> <text font = 'text_button' diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx index b9c2781fa5..2e37b00c91 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -610,7 +610,7 @@ <widget name = 'ProgressBar' height = 'Globals.Button.Height' /> - <space size = '1'/> + <space size = '1'/> <widget name = 'PercentText' height = 'Globals.Line.Height' textalign = 'center' @@ -657,7 +657,7 @@ /> <widget name = 'ReturnLine2' height = 'Globals.Line.Height' - /> + /> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'> <widget name = 'CodeBox1' width = '70' @@ -699,7 +699,7 @@ /> <space size = '6' /> </layout> - </layout> + </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'CancelButton' type = 'Button' @@ -1244,7 +1244,7 @@ width = '496' height = 'Globals.Button.Height' /> - <space size = '1'/> + <space size = '1'/> <widget name = 'PercentText' width = '496' height = 'Globals.Line.Height' @@ -1255,7 +1255,7 @@ <widget name = 'Cancel' width = '150' height = 'Globals.Button.Height' - /> + /> <widget name = 'Background' width = '150' height = 'Globals.Button.Height' diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx index 7c062f7776..06ce6f6003 100644 --- a/gui/themes/scummclassic/classic_layout_lowres.stx +++ b/gui/themes/scummclassic/classic_layout_lowres.stx @@ -538,7 +538,7 @@ <dialog name = 'GlobalOptions_Cloud_Container' overlays = 'GlobalOptions_Cloud.Container'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> - <widget name = 'StoragePopupDesc' + <widget name = 'StoragePopupDesc' width = '80' height = 'Globals.Line.Height' textalign = 'right' @@ -625,7 +625,7 @@ <widget name = 'ProgressBar' height = 'Globals.Button.Height' /> - <space size = '1'/> + <space size = '1'/> <widget name = 'PercentText' height = 'Globals.Line.Height' textalign = 'center' @@ -709,7 +709,7 @@ height = 'Globals.Line.Height' /> <space size = '4' /> - </layout> + </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'CancelButton' type = 'Button' @@ -1247,7 +1247,7 @@ width = '240' height = 'Globals.Button.Height' /> - <space size = '1'/> + <space size = '1'/> <widget name = 'PercentText' width = '240' height = 'Globals.Line.Height' @@ -1258,7 +1258,7 @@ <widget name = 'Cancel' width = '100' height = 'Globals.Button.Height' - /> + /> <widget name = 'Background' width = '100' height = 'Globals.Button.Height' diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx index 3a1ec5a5f0..31b194d174 100644 --- a/gui/themes/scummmodern/scummmodern_gfx.stx +++ b/gui/themes/scummmodern/scummmodern_gfx.stx @@ -181,7 +181,7 @@ <text_color id = 'color_button_hover' color = 'white' /> - + <text_color id = 'color_alternative_inverted' color = 'white' /> @@ -327,7 +327,7 @@ orientation = 'top' /> </drawdata> - + <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y>399'> <drawstep func = 'roundedsq' radius = '10' @@ -350,7 +350,7 @@ orientation = 'top' /> </drawdata> - + <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y<400'> <drawstep func = 'roundedsq' radius = '10' @@ -476,7 +476,7 @@ bg_color = 'xtrabrightred' shadow = '1' /> - + <drawstep func = 'triangle' bg_color = 'shadowcolor' fill = 'background' @@ -487,7 +487,7 @@ padding = '0, 0, 6, 0' orientation = 'bottom' /> - + <drawstep func = 'triangle' bg_color = 'shadowcolor' fill = 'background' @@ -498,14 +498,14 @@ padding = '0, 0, 6, 0' orientation = 'top' /> - + <text font = 'text_default' text_color = 'color_normal' vertical_align = 'center' horizontal_align = 'left' /> </drawdata> - + <drawdata id = 'popup_idle' cache = 'false' resolution ='y<400'> <drawstep func = 'roundedsq' radius = '5' @@ -515,7 +515,7 @@ bg_color = 'xtrabrightred' shadow = '1' /> - + <drawstep func = 'triangle' bg_color = 'shadowcolor' fill = 'background' @@ -526,7 +526,7 @@ padding = '0, 0, 3, 0' orientation = 'bottom' /> - + <drawstep func = 'triangle' bg_color = 'shadowcolor' fill = 'background' @@ -537,7 +537,7 @@ padding = '0, 0, 3, 0' orientation = 'top' /> - + <text font = 'text_default' text_color = 'color_normal' vertical_align = 'center' @@ -566,7 +566,7 @@ padding = '0, 0, 6, 0' orientation = 'bottom' /> - + <drawstep func = 'triangle' bg_color = 'shadowcolor' fill = 'background' @@ -577,14 +577,14 @@ padding = '0, 0, 6, 0' orientation = 'top' /> - + <text font = 'text_default' text_color = 'color_normal_hover' vertical_align = 'center' horizontal_align = 'left' /> </drawdata> - + <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y<400'> <drawstep func = 'roundedsq' radius = '5' @@ -594,7 +594,7 @@ bg_color = 'xtrabrightred' shadow = '2' /> - + <drawstep func = 'triangle' bg_color = 'shadowcolor' fill = 'background' @@ -605,7 +605,7 @@ padding = '0, 0, 3, 0' orientation = 'bottom' /> - + <drawstep func = 'triangle' bg_color = 'shadowcolor' fill = 'background' @@ -616,7 +616,7 @@ padding = '0, 0, 3, 0' orientation = 'top' /> - + <text font = 'text_default' text_color = 'color_normal' vertical_align = 'center' @@ -645,7 +645,7 @@ padding = '0, 0, 6, 0' orientation = 'bottom' /> - + <drawstep func = 'triangle' bg_color = 'shadowcolor' fill = 'background' @@ -656,14 +656,14 @@ padding = '0, 0, 6, 0' orientation = 'top' /> - + <text font = 'text_default' text_color = 'color_normal_hover' vertical_align = 'center' horizontal_align = 'left' /> </drawdata> - + <drawdata id = 'popup_hover' cache = 'false' resolution = 'y<400'> <drawstep func = 'roundedsq' radius = '5' @@ -673,7 +673,7 @@ bg_color = 'xtrabrightred' shadow = '1' /> - + <drawstep func = 'triangle' bg_color = 'shadowcolor' fill = 'background' @@ -684,7 +684,7 @@ padding = '0, 0, 3, 0' orientation = 'bottom' /> - + <drawstep func = 'triangle' bg_color = 'shadowcolor' fill = 'background' @@ -695,7 +695,7 @@ padding = '0, 0, 3, 0' orientation = 'top' /> - + <text font = 'text_default' text_color = 'color_normal' vertical_align = 'center' @@ -777,7 +777,7 @@ bevel = '1' bevel_color = 'black' /> - </drawdata> + </drawdata> <!-- Idle button --> <drawdata id = 'button_idle' cache = 'false'> diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx index e0ea86893a..49876be18b 100644 --- a/gui/themes/scummmodern/scummmodern_layout.stx +++ b/gui/themes/scummmodern/scummmodern_layout.stx @@ -624,7 +624,7 @@ <widget name = 'ProgressBar' height = 'Globals.Button.Height' /> - <space size = '1'/> + <space size = '1'/> <widget name = 'PercentText' height = 'Globals.Line.Height' textalign = 'center' @@ -671,7 +671,7 @@ /> <widget name = 'ReturnLine2' height = 'Globals.Line.Height' - /> + /> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'> <widget name = 'CodeBox1' width = '70' @@ -713,7 +713,7 @@ /> <space size = '6' /> </layout> - </layout> + </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'CancelButton' type = 'Button' @@ -1258,7 +1258,7 @@ width = '496' height = 'Globals.Button.Height' /> - <space size = '1'/> + <space size = '1'/> <widget name = 'PercentText' width = '496' height = 'Globals.Line.Height' @@ -1269,7 +1269,7 @@ <widget name = 'Cancel' width = '150' height = 'Globals.Button.Height' - /> + /> <widget name = 'Background' width = '150' height = 'Globals.Button.Height' diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx index ceb43bb717..e10ce4a6c2 100644 --- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx +++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx @@ -536,7 +536,7 @@ <dialog name = 'GlobalOptions_Cloud_Container' overlays = 'GlobalOptions_Cloud.Container'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> - <widget name = 'StoragePopupDesc' + <widget name = 'StoragePopupDesc' width = '80' height = 'Globals.Line.Height' textalign = 'right' @@ -623,7 +623,7 @@ <widget name = 'ProgressBar' height = 'Globals.Button.Height' /> - <space size = '1'/> + <space size = '1'/> <widget name = 'PercentText' height = 'Globals.Line.Height' textalign = 'center' @@ -707,7 +707,7 @@ height = 'Globals.Line.Height' /> <space size = '4' /> - </layout> + </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'CancelButton' type = 'Button' @@ -1245,7 +1245,7 @@ width = '240' height = 'Globals.Button.Height' /> - <space size = '1'/> + <space size = '1'/> <widget name = 'PercentText' width = '240' height = 'Globals.Line.Height' @@ -1256,7 +1256,7 @@ <widget name = 'Cancel' width = '100' height = 'Globals.Button.Height' - /> + /> <widget name = 'Background' width = '100' height = 'Globals.Button.Height' diff --git a/gui/widgets/scrollcontainer.cpp b/gui/widgets/scrollcontainer.cpp index 820c00f18a..9a7792730d 100644 --- a/gui/widgets/scrollcontainer.cpp +++ b/gui/widgets/scrollcontainer.cpp @@ -52,7 +52,7 @@ void ScrollContainerWidget::init() { void ScrollContainerWidget::recalc() { int scrollbarWidth = g_gui.xmlEval()->getVar("Globals.Scrollbar.Width", 0); _limitH = _h; - + //calculate virtual height const int spacing = g_gui.xmlEval()->getVar("Global.Font.Height", 16); //on the bottom int h = 0; @@ -120,7 +120,7 @@ void ScrollContainerWidget::reflowLayout() { //hide and move widgets, if needed sendCommand(_reflowCmd, 0); - + //recalculate height recalc(); |