Ignore requested position -> geometry.
svn path=/trunk/KDE/kdebase/kwin/; revision=444049icc-effect-5.14.5
parent
3ec72118f2
commit
3fb4801635
|
@ -2231,7 +2231,7 @@
|
||||||
<cstring>enable_ignoreposition</cstring>
|
<cstring>enable_ignoreposition</cstring>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Ignore requested &position</string>
|
<string>Ignore requested &geometry</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="KComboBox" row="3" column="1">
|
<widget class="KComboBox" row="3" column="1">
|
||||||
|
|
|
@ -250,7 +250,7 @@ bool Client::manage( Window w, bool isMapped )
|
||||||
; // force using placement policy
|
; // force using placement policy
|
||||||
else
|
else
|
||||||
usePosition = true;
|
usePosition = true;
|
||||||
if( !rules()->checkIgnorePosition( !usePosition ))
|
if( !rules()->checkIgnoreGeometry( !usePosition ))
|
||||||
{
|
{
|
||||||
bool ignorePPosition = ( options->ignorePositionClasses.contains(QString::fromLatin1(resourceClass())));
|
bool ignorePPosition = ( options->ignorePositionClasses.contains(QString::fromLatin1(resourceClass())));
|
||||||
|
|
||||||
|
|
13
rules.cpp
13
rules.cpp
|
@ -565,6 +565,13 @@ APPLY_FORCE_RULE( maxsize, MaxSize, QSize )
|
||||||
APPLY_FORCE_RULE( opacityactive, OpacityActive, int )
|
APPLY_FORCE_RULE( opacityactive, OpacityActive, int )
|
||||||
APPLY_FORCE_RULE( opacityinactive, OpacityInactive, int )
|
APPLY_FORCE_RULE( opacityinactive, OpacityInactive, int )
|
||||||
APPLY_FORCE_RULE( ignoreposition, IgnorePosition, bool )
|
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_RULE( desktop, Desktop, int )
|
||||||
APPLY_FORCE_RULE( type, Type, NET::WindowType )
|
APPLY_FORCE_RULE( type, Type, NET::WindowType )
|
||||||
|
|
||||||
|
@ -760,6 +767,12 @@ CHECK_FORCE_RULE( MaxSize, QSize )
|
||||||
CHECK_FORCE_RULE( OpacityActive, int )
|
CHECK_FORCE_RULE( OpacityActive, int )
|
||||||
CHECK_FORCE_RULE( OpacityInactive, int )
|
CHECK_FORCE_RULE( OpacityInactive, int )
|
||||||
CHECK_FORCE_RULE( IgnorePosition, bool )
|
CHECK_FORCE_RULE( IgnorePosition, bool )
|
||||||
|
|
||||||
|
bool WindowRules::checkIgnoreGeometry( bool ignore ) const
|
||||||
|
{
|
||||||
|
return checkIgnorePosition( ignore );
|
||||||
|
}
|
||||||
|
|
||||||
CHECK_RULE( Desktop, int )
|
CHECK_RULE( Desktop, int )
|
||||||
CHECK_FORCE_RULE( Type, NET::WindowType )
|
CHECK_FORCE_RULE( Type, NET::WindowType )
|
||||||
CHECK_RULE( MaximizeVert, KDecorationDefines::MaximizeMode )
|
CHECK_RULE( MaximizeVert, KDecorationDefines::MaximizeMode )
|
||||||
|
|
6
rules.h
6
rules.h
|
@ -50,7 +50,7 @@ class WindowRules
|
||||||
QSize checkMaxSize( QSize s ) const;
|
QSize checkMaxSize( QSize s ) const;
|
||||||
int checkOpacityActive(int s) const;
|
int checkOpacityActive(int s) const;
|
||||||
int checkOpacityInactive(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;
|
int checkDesktop( int desktop, bool init = false ) const;
|
||||||
NET::WindowType checkType( NET::WindowType type ) const;
|
NET::WindowType checkType( NET::WindowType type ) const;
|
||||||
MaximizeMode checkMaximize( MaximizeMode mode, bool init = false ) const;
|
MaximizeMode checkMaximize( MaximizeMode mode, bool init = false ) const;
|
||||||
|
@ -69,6 +69,7 @@ class WindowRules
|
||||||
bool checkStrictGeometry( bool strict ) const;
|
bool checkStrictGeometry( bool strict ) const;
|
||||||
QString checkShortcut( QString s, bool init = false ) const;
|
QString checkShortcut( QString s, bool init = false ) const;
|
||||||
bool checkDisableGlobalShortcuts( bool disable ) const;
|
bool checkDisableGlobalShortcuts( bool disable ) const;
|
||||||
|
bool checkIgnorePosition( bool ignore ) const; // obsolete
|
||||||
private:
|
private:
|
||||||
MaximizeMode checkMaximizeVert( MaximizeMode mode, bool init ) const;
|
MaximizeMode checkMaximizeVert( MaximizeMode mode, bool init ) const;
|
||||||
MaximizeMode checkMaximizeHoriz( MaximizeMode mode, bool init ) const;
|
MaximizeMode checkMaximizeHoriz( MaximizeMode mode, bool init ) const;
|
||||||
|
@ -100,7 +101,7 @@ class Rules
|
||||||
bool applyMaxSize( QSize& s ) const;
|
bool applyMaxSize( QSize& s ) const;
|
||||||
bool applyOpacityActive(int& s) const;
|
bool applyOpacityActive(int& s) const;
|
||||||
bool applyOpacityInactive(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 applyDesktop( int& desktop, bool init ) const;
|
||||||
bool applyType( NET::WindowType& type ) const;
|
bool applyType( NET::WindowType& type ) const;
|
||||||
bool applyMaximizeVert( MaximizeMode& mode, bool init ) const;
|
bool applyMaximizeVert( MaximizeMode& mode, bool init ) const;
|
||||||
|
@ -120,6 +121,7 @@ class Rules
|
||||||
bool applyStrictGeometry( bool& strict ) const;
|
bool applyStrictGeometry( bool& strict ) const;
|
||||||
bool applyShortcut( QString& shortcut, bool init ) const;
|
bool applyShortcut( QString& shortcut, bool init ) const;
|
||||||
bool applyDisableGlobalShortcuts( bool& disable ) const;
|
bool applyDisableGlobalShortcuts( bool& disable ) const;
|
||||||
|
bool applyIgnorePosition( bool& ignore ) const; // obsolete
|
||||||
private:
|
private:
|
||||||
#endif
|
#endif
|
||||||
bool matchType( NET::WindowType match_type ) const;
|
bool matchType( NET::WindowType match_type ) const;
|
||||||
|
|
Loading…
Reference in New Issue