yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert special dialog placement policies. I don't think I need to go

Browse source 
that far with overconfigurability.

svn path=/trunk/kdebase/kwin/; revision=255440
This commit is contained in:
Luboš Luňák 2003-10-01 16:51:19 +00:00
parent 7c751219d0
commit 6f272da774
4 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manage.cpp
View file

@ -222,7 +222,7 @@ bool Client::manage( Window w, bool isMapped )
} }
else if( isDialog()) else if( isDialog())
{ {
if( options->dialog_placement == Options::ObeyApplication ) if( false )
placementDone = true; placementDone = true;
// else force using placement policy // else force using placement policy
} }

7
options.cpp
View file

@ -90,13 +90,6 @@ unsigned long Options::updateSettings()
else if (val == "ZeroCornered") placement = ZeroCornered; else if (val == "ZeroCornered") placement = ZeroCornered;
else placement = Smart; else placement = Smart;
val = config->readEntry("DialogPlacement", "ObeyApplication" ); // TODO is this good default?
if( val == "DialogCentered" ) dialog_placement = DialogCentered;
else if( val == "OnMainWindow" ) dialog_placement = OnMainWindow;
else if( val == "UnderMouse" ) dialog_placement = UnderMouse;
else if( val == "DialogPlaced" ) dialog_placement = DialogPlaced;
else dialog_placement = ObeyApplication;
animateShade = config->readBoolEntry("AnimateShade", TRUE ); animateShade = config->readBoolEntry("AnimateShade", TRUE );
animateMinimize = config->readBoolEntry("AnimateMinimize", TRUE ); animateMinimize = config->readBoolEntry("AnimateMinimize", TRUE );

3
options.h
View file

@ -136,9 +136,6 @@ class Options : public KDecorationOptions
enum PlacementPolicy { Random, Smart, Cascade, Centered, ZeroCornered }; enum PlacementPolicy { Random, Smart, Cascade, Centered, ZeroCornered };
PlacementPolicy placement; PlacementPolicy placement;
enum DialogPlacementPolicy { ObeyApplication, DialogCentered, OnMainWindow, UnderMouse, DialogPlaced };
DialogPlacementPolicy dialog_placement;
bool focusPolicyIsReasonable() bool focusPolicyIsReasonable()
{ {
return focusPolicy == ClickToFocus || focusPolicy == FocusFollowsMouse; return focusPolicy == ClickToFocus || focusPolicy == FocusFollowsMouse;

13
placement.cpp
View file

@ -402,21 +402,10 @@ void Placement::placeUtility(Client* c)
} }
void Placement::placeDialog(Client* c) void Placement::placeDialog(Client*)
{ {
if( options->dialog_placement == Options::ObeyApplication )
;
else if( options->dialog_placement == Options::DialogCentered )
placeCentered( c );
else if( options->dialog_placement == Options::OnMainWindow )
placeOnMainWindow( c );
else if( options->dialog_placement == Options::UnderMouse )
placeUnderMouse( c );
else
placeInternal( c ); // Standard - normal placement policy
} }
void Placement::placeUnderMouse(Client* c) void Placement::placeUnderMouse(Client* c)
{ {
QRect geom = c->geometry(); QRect geom = c->geometry();