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

List:       kde-commits
Subject:    KDE/kdebase/kwin
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2005-08-08 14:27:27
Message-ID: 1123511247.217689.16656.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 444049 by lunakl:

Ignore requested position -> geometry.



 M  +1 -1      kcmkwin/kwinrules/ruleswidgetbase.ui  
 M  +1 -1      manage.cpp  
 M  +13 -0     rules.cpp  
 M  +4 -2      rules.h  


--- trunk/KDE/kdebase/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui #444048:444049
@@ -2231,7 +2231,7 @@
                             <cstring>enable_ignoreposition</cstring>
                         </property>
                         <property name="text">
-                            <string>Ignore requested &amp;position</string>
+                            <string>Ignore requested &amp;geometry</string>
                         </property>
                     </widget>
                     <widget class="KComboBox" row="3" column="1">
--- trunk/KDE/kdebase/kwin/manage.cpp #444048:444049
@@ -250,7 +250,7 @@
         ; // force using placement policy
     else
         usePosition = true;
-    if( !rules()->checkIgnorePosition( !usePosition ))
+    if( !rules()->checkIgnoreGeometry( !usePosition ))
         {
         bool ignorePPosition = ( \
options->ignorePositionClasses.contains(QString::fromLatin1(resourceClass())));  
--- trunk/KDE/kdebase/kwin/rules.cpp #444048:444049
@@ -565,6 +565,13 @@
 APPLY_FORCE_RULE( opacityactive, OpacityActive, int )
 APPLY_FORCE_RULE( opacityinactive, OpacityInactive, int )
 APPLY_FORCE_RULE( ignoreposition, IgnorePosition, bool )
+
+// the cfg. entry needs to stay named the say for backwards compatibility
+bool Rules::applyIgnoreGeometry( bool& ignore ) const
+    {
+    return applyIgnorePosition( ignore );
+    }
+
 APPLY_RULE( desktop, Desktop, int )
 APPLY_FORCE_RULE( type, Type, NET::WindowType )
 
@@ -760,6 +767,12 @@
 CHECK_FORCE_RULE( OpacityActive, int )
 CHECK_FORCE_RULE( OpacityInactive, int )
 CHECK_FORCE_RULE( IgnorePosition, bool )
+
+bool WindowRules::checkIgnoreGeometry( bool ignore ) const
+    {
+    return checkIgnorePosition( ignore );
+    }
+
 CHECK_RULE( Desktop, int )
 CHECK_FORCE_RULE( Type, NET::WindowType )
 CHECK_RULE( MaximizeVert, KDecorationDefines::MaximizeMode )
--- trunk/KDE/kdebase/kwin/rules.h #444048:444049
@@ -50,7 +50,7 @@
         QSize checkMaxSize( QSize s ) const;
         int checkOpacityActive(int s) const;
         int checkOpacityInactive(int s) const;
-        bool checkIgnorePosition( bool ignore ) const;
+        bool checkIgnoreGeometry( bool ignore ) const;
         int checkDesktop( int desktop, bool init = false ) const;
         NET::WindowType checkType( NET::WindowType type ) const;
         MaximizeMode checkMaximize( MaximizeMode mode, bool init = false ) const;
@@ -69,6 +69,7 @@
         bool checkStrictGeometry( bool strict ) const;
         QString checkShortcut( QString s, bool init = false ) const;
         bool checkDisableGlobalShortcuts( bool disable ) const;
+        bool checkIgnorePosition( bool ignore ) const; // obsolete
     private:
         MaximizeMode checkMaximizeVert( MaximizeMode mode, bool init ) const;
         MaximizeMode checkMaximizeHoriz( MaximizeMode mode, bool init ) const;
@@ -100,7 +101,7 @@
         bool applyMaxSize( QSize& s ) const;
         bool applyOpacityActive(int& s) const;
         bool applyOpacityInactive(int& s) const;
-        bool applyIgnorePosition( bool& ignore ) const;
+        bool applyIgnoreGeometry( bool& ignore ) const;
         bool applyDesktop( int& desktop, bool init ) const;
         bool applyType( NET::WindowType& type ) const;
         bool applyMaximizeVert( MaximizeMode& mode, bool init ) const;
@@ -120,6 +121,7 @@
         bool applyStrictGeometry( bool& strict ) const;
         bool applyShortcut( QString& shortcut, bool init ) const;
         bool applyDisableGlobalShortcuts( bool& disable ) const;
+        bool applyIgnorePosition( bool& ignore ) const; // obsolete
     private:
 #endif
         bool matchType( NET::WindowType match_type ) const;


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