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

List:       kde-commits
Subject:    kdelibs/kmdi/kmdi
From:       Joseph Wenninger <kde () jowenn ! at>
Date:       2004-09-11 21:58:44
Message-ID: 20040911215844.7D1BA1C67 () office ! kde ! org
[Download RAW message or body]

CVS commit by jowenn: 

Make dock container tabstyles configurable again, better handling line add/remove of \
collapsed containers during resizing


  M +20 -2     dockcontainer.cpp   1.8
  M +1 -1      dockcontainer.h   1.5
  M +5 -5      mainwindow.cpp   1.14
  M +1 -1      mainwindow.h   1.11


--- kdelibs/kmdi/kmdi/dockcontainer.cpp  #1.7:1.8
@@ -105,5 +106,5 @@ DockContainer::DockContainer(QWidget *pa
   l->activate();
   m_ws->hide();
-
+  m_tb->installEventFilter(this);
 }
 
@@ -228,4 +232,14 @@ void DockContainer::insertWidget (KDockW
 bool DockContainer::eventFilter( QObject *obj, QEvent *event )
 {
+    if (obj==m_tb) {
+        if ( (event->type()==QEvent::Resize)  && (m_ws->isHidden()) ) {
+                QSize size=((QResizeEvent*)event)->size();
+                  if (m_vertical)
+                          parentDockWidget()->setForcedFixedWidth(size.width());
+                  else
+                          parentDockWidget()->setForcedFixedHeight(size.height());
+        }
+    }
+    else
     switch ( event->type() ){
       case QEvent::MouseButtonPress:
@@ -260,4 +274,5 @@ bool DockContainer::eventFilter( QObject
                         m_startEvent=0;
                 }
+                break;
       case QEvent::MouseMove:
                 if (m_movingState==WaitingForMoveStart) {
@@ -282,4 +297,6 @@ bool DockContainer::eventFilter( QObject
 void DockContainer::showWidget(KDockWidget *w) {
     if (!m_map.contains(w)) return;
+
+    kdDebug()<<"KMDI::DockContainer::<showWidget"<<endl;
     int id=m_map[w];
     m_tb->setTab(id,true);
@@ -365,5 +383,5 @@ void DockContainer::tabClicked(int t)
   bool call_makeVisible=!m_tabSwitching;
   m_tabSwitching=true;
-  if (m_tb->isTabRaised(t))
+  if ((t!=-1) && m_tb->isTabRaised(t))
   {
 

--- kdelibs/kmdi/kmdi/dockcontainer.h  #1.4:1.5
@@ -96,5 +96,5 @@ class DockContainer: public QWidget, pub
     KDockManager *m_dockManager;
     QMouseEvent *m_startEvent;
-    enum MovingState {NotMoving=0,WaitingForMoveStart,Moving} m_movingState;
+    enum MovingState {NotMoving=0,WaitingForMoveStart,MovingInternal,Moving} \
m_movingState;  signals:
         void activated(DockContainer*);

--- kdelibs/kmdi/kmdi/mainwindow.cpp  #1.13:1.14
@@ -313,18 +313,18 @@ void MainWindow::deleteToolWindow( QWidg
 }
 
-void MainWindow::setToolviewStyle(int flag)
+void MainWindow::setToolViewStyle(int flag)
 {
   d->m_styleIDEAlMode = flag; // see KMultiTabBar for the first 3 bits
 
-  DockContainer *tmpL=(DockContainer*) \
(m_leftContainer->getWidget()->qt_cast("DockContainer")); +  DockContainer \
*tmpL=(DockContainer*) \
(m_leftContainer->getWidget()->qt_cast("KMDI::DockContainer"));  if (tmpL) \
tmpL->setStyle(flag);  
-  DockContainer *tmpR=(DockContainer*) \
(m_rightContainer->getWidget()->qt_cast("DockContainer")); +  DockContainer \
*tmpR=(DockContainer*) \
(m_rightContainer->getWidget()->qt_cast("KMDI::DockContainer"));  if (tmpR) \
tmpR->setStyle(flag);  
-  DockContainer *tmpT=(DockContainer*) \
(m_topContainer->getWidget()->qt_cast("DockContainer")); +  DockContainer \
*tmpT=(DockContainer*) (m_topContainer->getWidget()->qt_cast("KMDI::DockContainer")); \
if (tmpT) tmpT->setStyle(flag);  
-  DockContainer *tmpB=(DockContainer*) \
(m_bottomContainer->getWidget()->qt_cast("DockContainer")); +  DockContainer \
*tmpB=(DockContainer*) \
(m_bottomContainer->getWidget()->qt_cast("KMDI::DockContainer"));  if (tmpB) \
tmpB->setStyle(flag);  

--- kdelibs/kmdi/kmdi/mainwindow.h  #1.10:1.11
@@ -128,5 +128,5 @@ class MainWindow : public KParts::DockMa
      * @param flags See KMDI::ToolviewStyle.
      */
-    void setToolviewStyle(int flags);
+    void setToolViewStyle(int flags);
 
   public slots:


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