[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kmdi-devel
Subject:    kdelibs/kmdi
From:       dhdev () gmx ! de (Dominik Haumann)
Date:       2005-03-06 20:27:58
Message-ID: 20050306192750.5C500E772 () office ! kde ! org
[Download RAW message or body]

CVS commit by dhaumann: 

fix bug (you all know it, I'm sure):
1. open sidebar
2. non-overlap mode
3. close sidebar
4. restart app
5. Now the non-overlap mode was lost, the flag just was not saved somehow.

Tested with Quanta and Kate. KDevelop 3.1.2 doesn't seem to save its settings,
that true?

NOTE: This is a small HACK, the code now activates the overlap mode, and then
      deactivates it again (if nonoverlap mode). I couldn't work around this,
      but as this works, I think it's sufficient.

Backport follows.

CCMAIL: kmdi-devel@kde.org


  M +3 -0      kmdidockcontainer.cpp   1.74
  M +5 -2      kmdi/dockcontainer.cpp   1.12


--- kdelibs/kmdi/kmdidockcontainer.cpp  #1.73:1.74
@@ -153,4 +153,5 @@ KMdiDockContainer::~KMdiDockContainer()
 void KMdiDockContainer::init()
 {
+        bool overlap = isOverlapMode();
         kdDebug( 760 ) << k_funcinfo << endl;
         if ( !m_horizontal )
@@ -167,4 +168,6 @@ void KMdiDockContainer::init()
         }
 
+        if (!overlap) deactivateOverlapMode();
+
         // try to restore splitter size
         if ( parentDockWidget() && parentDockWidget()->parent() )

--- kdelibs/kmdi/kmdi/dockcontainer.cpp  #1.11:1.12
@@ -132,4 +132,5 @@ DockContainer::~DockContainer()
 void DockContainer::init()
 {
+  bool overlap = isOverlapMode();
   if (m_vertical)
   {
@@ -143,4 +144,6 @@ void DockContainer::init()
   }
 
+  if (!overlap) deactivateOverlapMode();
+
   // try to restore splitter size
   if ( parentDockWidget() && parentDockWidget()->parent() )


[prev in list] [next in list] [prev in thread] [next in thread]