summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authordeva <deva>2011-02-08 14:06:17 +0000
committerdeva <deva>2011-02-08 14:06:17 +0000
commit4997e2fb0e41056c797632aef354447062040f66 (patch)
tree18b9cf27a4e410854a0e303afabea1580406875d /client
parentfbc4eaf5c102a3e2d9ccd1c8cc821d920467c8b1 (diff)
Remake previous fix for resume text not shown in full height.
Diffstat (limited to 'client')
-rw-r--r--client/macrowindow.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/client/macrowindow.cc b/client/macrowindow.cc
index 4ee5404..37dc6e3 100644
--- a/client/macrowindow.cc
+++ b/client/macrowindow.cc
@@ -109,8 +109,12 @@ void MacroWindow::initMacro(QDomNode &node)
if(elem.attribute("state") == "dirty") state = ResumeWidget::DIRTY;
}
- collapse();
+ if(!mainwidget) { // Only call collapse if the macro is in resume state.
+ collapse();
+ }
+
((ResumeWidget*)collapsedWidget())->setText(resume, state);
+
} else if(elem.tagName() == "script") {
lua->runScript(elem.text(), NULL, "preload");
@@ -123,11 +127,11 @@ void MacroWindow::initMacro(QDomNode &node)
clear();
}
- DEBUG(mainwindow, "----------------------Before--------------------------");
+ DEBUG(mainwindow, "----------------------Before-----------------------\n");
Window *window = new Window(elem, this);
- DEBUG(mainwindow, "----------------------After--------------------------");
+ DEBUG(mainwindow, "----------------------After------------------------\n");
connect(window, SIGNAL(wasChanged()), this, SLOT(macroChanged()));
macrotitle = elem.attribute("caption");