Fix journal view scrollbar jumpiness. Fix scroll to view on open of new macro. Added new attribute 'type' to checkgroupbox.

1 files changed, 4 insertions, 4 deletions

diff --git a/client/macrowindow.cc b/client/macrowindow.cc
index 3776a6b..00eb1ed 100644
--- a/client/macrowindow.cc
+++ b/client/macrowindow.cc
@@ -50,7 +50,7 @@ MacroWindow::MacroWindow(NetCom &n, QString templ,
                          bool is_static, bool compact,
                          QScrollArea *scrollarea,
                          MacroDrawer *d)
-  : Collapser(NULL, compact?NULL:scrollarea), netcom(n)
+  : Collapser(NULL, is_static?NULL:scrollarea), netcom(n)
 {
   drawer = d;
   this->is_static = is_static;
@@ -95,7 +95,7 @@ void MacroWindow::update(QDomNode &node)
 
   // No content reveals resumewidget with 'dummy' text.
   if(children.count() == 0) {
-    animateToWidget(resumewidget);
+    animateToWidget(resumewidget, false);
     return;
   }
 
@@ -124,7 +124,7 @@ void MacroWindow::updateResume(QDomNode &node)
   }
 
   resumewidget->setText(resume, state);
-  animateToWidget(resumewidget);
+  animateToWidget(resumewidget, false);
 }
 
 void MacroWindow::initMacro(QDomNode &node)
@@ -150,7 +150,7 @@ void MacroWindow::initMacro(QDomNode &node)
     if(waschanged == true) macroChanged();
 
     WARN(macrowindow, "New window.\n");
-    animateToWidget(mainwidget->qwidget());
+    animateToWidget(mainwidget->qwidget(), true);
 
     return; // No further recursion here.
   }