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

List:       kde-commits
Subject:    kdebase/kicker/core
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2005-03-02 3:44:56
Message-ID: 20050302034456.2239E16EF1 () office ! kde ! org
[Download RAW message or body]

CVS commit by aseigo: 

don't allow drag moving of the menu bar panel.

backport (3.4.1?)

CCBUGS:100576


  M +3 -1      container_extension.cpp   1.117
  M +5 -0      extensionmanager.cpp   1.71
  M +1 -0      extensionmanager.h   1.32


--- kdebase/kicker/core/container_extension.cpp  #1.116:1.117
@@ -1849,5 +1849,7 @@ bool ExtensionContainer::eventFilter( QO
             if (_is_lmb_down &&
                 ((me->state() & LeftButton) == LeftButton) &&
-                !Kicker::the()->isImmutable())
+                !Kicker::the()->isImmutable() &&
+                !m_settings.config()->isImmutable() &&
+                !ExtensionManager::the()->isMenuBar(this))
             {
                 QPoint p(me->globalPos() - _last_lmb_press);

--- kdebase/kicker/core/extensionmanager.cpp  #1.70:1.71
@@ -358,4 +358,9 @@ bool ExtensionManager::isMainPanel(const
 }
 
+bool ExtensionManager::isMenuBar(const QWidget* panel) const
+{
+    return m_menubarPanel == panel;
+}
+
 void ExtensionManager::addExtension( const QString& desktopFile )
 {

--- kdebase/kicker/core/extensionmanager.h  #1.31:1.32
@@ -44,4 +44,5 @@ public:
     void addExtension( const QString &desktopFile );
     bool isMainPanel(const QWidget* panel) const;
+    bool isMenuBar(const QWidget* panel) const;
     void addContainer( ExtensionContainer* );
     void removeAllContainers();


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