Revert special dialog placement policies. I don't think I need to go
that far with overconfigurability. svn path=/trunk/kdebase/kwin/; revision=255440
This commit is contained in:
parent
7c751219d0
commit
6f272da774
4 changed files with 2 additions and 23 deletions
|
@ -222,7 +222,7 @@ bool Client::manage( Window w, bool isMapped )
|
|||
}
|
||||
else if( isDialog())
|
||||
{
|
||||
if( options->dialog_placement == Options::ObeyApplication )
|
||||
if( false )
|
||||
placementDone = true;
|
||||
// else force using placement policy
|
||||
}
|
||||
|
|
|
@ -90,13 +90,6 @@ unsigned long Options::updateSettings()
|
|||
else if (val == "ZeroCornered") placement = ZeroCornered;
|
||||
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 );
|
||||
|
||||
animateMinimize = config->readBoolEntry("AnimateMinimize", TRUE );
|
||||
|
|
|
@ -136,9 +136,6 @@ class Options : public KDecorationOptions
|
|||
enum PlacementPolicy { Random, Smart, Cascade, Centered, ZeroCornered };
|
||||
PlacementPolicy placement;
|
||||
|
||||
enum DialogPlacementPolicy { ObeyApplication, DialogCentered, OnMainWindow, UnderMouse, DialogPlaced };
|
||||
DialogPlacementPolicy dialog_placement;
|
||||
|
||||
bool focusPolicyIsReasonable()
|
||||
{
|
||||
return focusPolicy == ClickToFocus || focusPolicy == FocusFollowsMouse;
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
QRect geom = c->geometry();
|
||||
|
|
Loading…
Reference in a new issue