Ticket #5956: clear-buttons.diff

gui/dialog.cpp

@@ -334 +334 @@
         if (del == _dragWidget)
                 _dragWidget = NULL;
 
-        Widget *w = _firstWidget;
-
-        if (del == _firstWidget) {
-                Widget *del_next = del->_next;
-                del->_next = 0;
-                _firstWidget = del_next;
-                return;
-        }
-
-        w = _firstWidget;
-        while (w) {
-                if (w->_next == del) {
-                        Widget *del_next = del->_next;
-                        del->_next = 0;
-                        w->_next = del_next;
-                        return;
-                }
-                w = w->_next;
-        }
+       GuiObject::removeWidget(del);
 }
 
 } // End of namespace GUI

gui/object.cpp

@@ -59 +59 @@
         }
 }
 
+void GuiObject::removeWidget(Widget *del) {
+        if (del == _firstWidget) {
+                Widget *del_next = del->next();
+                del->setNext(0);
+                _firstWidget = del_next;
+                return;
+        }
+
+        Widget *w = _firstWidget;
+        while (w) {
+                if (w->next() == del) {
+                        Widget *del_next = del->next();
+                        del->setNext(0);
+                        w->setNext(del_next);
+                        return;
+                }
+                w = w->next();
+        }
+}
+
 } // End of namespace GUI

gui/object.h

@@ -83 +83 @@
 
         virtual void    reflowLayout();
 
+        virtual void    removeWidget(Widget *widget);
+
 protected:
         virtual void    releaseFocus() = 0;
 };

gui/options.cpp

@@ -79 +79 @@
 static const int outputRateValues[] = { 0, 8000, 11025, 22050, 44100, 48000, -1 };
 
 OptionsDialog::OptionsDialog(const Common::String &domain, int x, int y, int w, int h)
-        : Dialog(x, y, w, h), _domain(domain), _graphicsTabId(-1), _tabWidget(0) {
+        : Dialog(x, y, w, h), _domain(domain), _graphicsTabId(-1), _midiTabId(-1), _pathsTabId(-1), _tabWidget(0) {
         init();
 }
 
@@ -1090 +1090 @@
         //
         // 3) The MIDI tab
         //
-        tab->addTab(_("MIDI"));
+        _midiTabId = tab->addTab(_("MIDI"));
         addMIDIControls(tab, "GlobalOptions_MIDI.");
 
         //
@@ -1103 +1103 @@
         // 5) The Paths tab
         //
         if (g_system->getOverlayWidth() > 320)
-                tab->addTab(_("Paths"));
+                _pathsTabId = tab->addTab(_("Paths"));
         else
-                tab->addTab(_c("Paths", "lowres"));
+                _pathsTabId = tab->addTab(_c("Paths", "lowres"));
 
 #if !( defined(__DC__) || defined(__GP32__) )
         // These two buttons have to be extra wide, or the text will be
@@ -1464 +1464 @@
         }
 }
 
+void GlobalOptionsDialog::reflowLayout() {
+        int activeTab = _tabWidget->getActiveTab();
+
+        if (_midiTabId != -1) {
+                _tabWidget->setActiveTab(_midiTabId);
+
+                _tabWidget->removeWidget(_soundFontClearButton);
+                _soundFontClearButton->setNext(0);
+                delete _soundFontClearButton;
+                _soundFontClearButton = addClearButton(_tabWidget, "GlobalOptions_MIDI.mcFontClearButton", kClearSoundFontCmd);
+        }
+
+        if (_pathsTabId != -1) {
+                _tabWidget->setActiveTab(_pathsTabId);
+
+                _tabWidget->removeWidget(_savePathClearButton);
+                _savePathClearButton->setNext(0);
+                delete _savePathClearButton;
+                _savePathClearButton = addClearButton(_tabWidget, "GlobalOptions_Paths.SavePathClearButton", kSavePathClearCmd);
+
+                _tabWidget->removeWidget(_themePathClearButton);
+                _themePathClearButton->setNext(0);
+                delete _themePathClearButton;
+                _themePathClearButton = addClearButton(_tabWidget, "GlobalOptions_Paths.ThemePathClearButton", kThemePathClearCmd);
+
+                _tabWidget->removeWidget(_extraPathClearButton);
+                _extraPathClearButton->setNext(0);
+                delete _extraPathClearButton;
+                _extraPathClearButton = addClearButton(_tabWidget, "GlobalOptions_Paths.ExtraPathClearButton", kExtraPathClearCmd);
+        }
+
+        _tabWidget->setActiveTab(activeTab);
+        OptionsDialog::reflowLayout();
+}
+
 } // End of namespace GUI

gui/options.h

@@ -87 +87 @@
 
         TabWidget *_tabWidget;
         int _graphicsTabId;
+        int _midiTabId;
+        int _pathsTabId;
 
 private:
         //
@@ -191 +193 @@
         void close();
         void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
 
+        virtual void reflowLayout();
+
 protected:
 #ifdef SMALL_SCREEN_DEVICE
         KeysDialog *_keysDialog;