From cb6c72436d96cc85d3442aeaf25ead4245420f8d Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Tue, 12 Apr 2011 10:09:07 +0000
Subject: Bugfix: Hide header and expand button if macro is static.
---
client/macro.cc | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/client/macro.cc b/client/macro.cc
index 0dcf590..d6be5cc 100644
--- a/client/macro.cc
+++ b/client/macro.cc
@@ -60,22 +60,21 @@ void Macro::update(QDomNode &node)
name = elem.attribute("name");
iscompleted = elem.attribute("completed", "false") == "true";
+ isstatic = elem.attribute("static", "false") == "true";
+ iscompact = elem.attribute("compact", "false") == "true";
if(drawer == NULL) {
drawer = new MacroDrawer(this, elem.attribute("caption", name));
- if(window == NULL) {
- isstatic = elem.attribute("static", "false") == "true";
- iscompact = elem.attribute("compact", "false") == "true";
-
- window = new MacroWindow(netcom, templ, isstatic, iscompact,
- scrollarea, drawer);
-
- QFont f = window->font();
- f.setBold(false);
- f.setItalic(false);
- window->setFont(f);
- }
+ if(window == NULL) {
+ window = new MacroWindow(netcom, templ, isstatic, iscompact,
+ scrollarea, drawer);
+
+ QFont f = window->font();
+ f.setBold(false);
+ f.setItalic(false);
+ window->setFont(f);
+ }
QHBoxLayout *l = new QHBoxLayout();
l->setContentsMargins(10,0,10,0);
--
cgit v1.2.3