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

Remove all code for non-composited animations - they don't work anyway.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=739143
This commit is contained in:
Luboš Luňák 2007-11-20 16:07:20 +00:00
parent 7bfa13af32
commit c83210c60a
14 changed files with 1 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bridge.cpp
View file

@ -145,14 +145,6 @@ Qt::WFlags Bridge::initialWFlags() const
return 0;
}
void Bridge::helperShowHide( bool show )
{
if( show )
c->rawShow();
else
c->rawHide();
}
QRegion Bridge::unobscuredRegion( const QRegion& r ) const
{
QRegion reg( r );

1
bridge.h
View file

@ -63,7 +63,6 @@ class Bridge : public KDecorationBridge
virtual int currentDesktop() const;
virtual QWidget* initialParentWidget() const;
virtual Qt::WFlags initialWFlags() const;
virtual void helperShowHide( bool show );
virtual void grabXServer( bool grab );
private:
Client* c;

4
kcmkwin/kwindecoration/preview.cpp
View file

@ -425,10 +425,6 @@ int KDecorationPreviewBridge::currentDesktop() const
return 1;
}
void KDecorationPreviewBridge::helperShowHide( bool )
{
}
void KDecorationPreviewBridge::grabXServer( bool )
{
}

1
kcmkwin/kwindecoration/preview.h
View file

@ -110,7 +110,6 @@ class KDecorationPreviewBridge
virtual int currentDesktop() const;
virtual QWidget* initialParentWidget() const;
virtual Qt::WFlags initialWFlags() const;
virtual void helperShowHide( bool show );
virtual void grabXServer( bool grab );
private:
KDecorationPreview* preview;

85
kcmkwin/kwinoptions/windows.cpp
View file

@ -61,8 +61,6 @@
#define KWIN_FOCUS "FocusPolicy"
#define KWIN_PLACEMENT "Placement"
#define KWIN_MOVE "MoveMode"
#define KWIN_MINIMIZE_ANIM "AnimateMinimize"
#define KWIN_MINIMIZE_ANIM_SPEED "AnimateMinimizeSpeed"
#define KWIN_RESIZE_OPAQUE "ResizeMode"
#define KWIN_GEOMETRY "GeometryTip"
#define KWIN_AUTORAISE_INTERVAL "AutoRaiseInterval"
@ -70,7 +68,6 @@
#define KWIN_DELAYFOCUS_INTERVAL "DelayFocusInterval"
#define KWIN_DELAYFOCUS "DelayFocus"
#define KWIN_CLICKRAISE "ClickRaise"
#define KWIN_ANIMSHADE "AnimateShade"
#define KWIN_MOVE_RESIZE_MAXIMIZED "MoveResizeMaximizedWindows"
#define KWIN_ALTTABMODE "AltTabStyle"
#define KWIN_TRAVERSE_ALL "TraverseAll"
@ -581,10 +578,6 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, const KCom
shBox = new Q3VButtonGroup(i18n("Shading"), this);
animateShade = new QCheckBox(i18n("Anima&te"), shBox);
animateShade->setWhatsThis( i18n("Animate the action of reducing the window to its titlebar (shading)"
" as well as the expansion of a shaded window") );
shadeHoverOn = new QCheckBox(i18n("&Enable hover"), shBox);
connect(shadeHoverOn, SIGNAL(toggled(bool)), this, SLOT(shadeHoverChanged(bool)));
@ -605,7 +598,6 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, const KCom
lay->addWidget(shBox);
// Any changes goes to slotChanged()
connect(animateShade, SIGNAL(toggled(bool)), SLOT(changed()));
connect(shadeHoverOn, SIGNAL(toggled(bool)), SLOT(changed()));
connect(shadeHover, SIGNAL(valueChanged(int)), SLOT(changed()));
@ -702,10 +694,6 @@ void KAdvancedConfig::shadeHoverChanged(bool a) {
shadeHover->setEnabled(a);
}
void KAdvancedConfig::setAnimateShade(bool a) {
animateShade->setChecked(a);
}
void KAdvancedConfig::setFocusStealing(int l) {
l = qMax( 0, qMin( 4, l ));
focusStealing->setCurrentIndex(l);
@ -719,7 +707,6 @@ void KAdvancedConfig::load( void )
{
KConfigGroup cg(config, "Windows");
setAnimateShade(cg.readEntry(KWIN_ANIMSHADE, true));
setShadeHover(cg.readEntry(KWIN_SHADEHOVER, false));
setShadeHoverInterval(cg.readEntry(KWIN_SHADEHOVER_INTERVAL, 250));
@ -739,7 +726,6 @@ void KAdvancedConfig::save( void )
int v;
KConfigGroup cg(config, "Windows");
cg.writeEntry(KWIN_ANIMSHADE, animateShade->isChecked());
cg.writeEntry(KWIN_SHADEHOVER, shadeHoverOn->isChecked());
v = getShadeHoverInterval();
@ -766,7 +752,6 @@ void KAdvancedConfig::save( void )
void KAdvancedConfig::defaults()
{
setAnimateShade(true);
setShadeHover(false);
setShadeHoverInterval(250);
setElectricBorders(0);
@ -861,38 +846,6 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, const KCompone
rLay->setColumnStretch(0,0);
rLay->setColumnStretch(1,1);
minimizeAnimOn = new QCheckBox(i18n("Animate minimi&ze and restore"),
windowsBox);
minimizeAnimOn->setWhatsThis( i18n("Enable this option if you want an animation shown when"
" windows are minimized or restored." ) );
rLay->addWidget(minimizeAnimOn,0,0);
minimizeAnimSlider = new QSlider(windowsBox);
minimizeAnimSlider->setRange( 0, 10 );
minimizeAnimSlider->setSingleStep( 1 );
minimizeAnimSlider->setPageStep( 1 );
minimizeAnimSlider->setValue( 0 );
minimizeAnimSlider->setOrientation( Qt::Horizontal );
minimizeAnimSlider->setTickPosition(QSlider::TicksBelow);
rLay->addWidget(minimizeAnimSlider,0,1,1,2);
connect(minimizeAnimOn, SIGNAL(toggled(bool)), this, SLOT(setMinimizeAnim(bool)));
connect(minimizeAnimSlider, SIGNAL(valueChanged(int)), this, SLOT(setMinimizeAnimSpeed(int)));
minimizeAnimSlowLabel= new QLabel(i18n("Slow"),windowsBox);
minimizeAnimSlowLabel->setAlignment(Qt::AlignTop|Qt::AlignLeft);
rLay->addWidget(minimizeAnimSlowLabel,1,1);
minimizeAnimFastLabel= new QLabel(i18n("Fast"),windowsBox);
minimizeAnimFastLabel->setAlignment(Qt::AlignTop|Qt::AlignRight);
rLay->addWidget(minimizeAnimFastLabel,1,2);
wtstr = i18n("Here you can set the speed of the animation shown when windows are"
" minimized and restored. ");
minimizeAnimSlider->setWhatsThis( wtstr );
minimizeAnimSlowLabel->setWhatsThis( wtstr );
minimizeAnimFastLabel->setWhatsThis( wtstr );
moveResizeMaximized = new QCheckBox( i18n("Allow moving and resizing o&f maximized windows"), windowsBox);
bLay->addWidget(moveResizeMaximized);
moveResizeMaximized->setWhatsThis( i18n("When enabled, this feature activates the border of maximized windows"
@ -992,8 +945,6 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, const KCompone
connect( opaque, SIGNAL(clicked()), SLOT(changed()));
connect( resizeOpaqueOn, SIGNAL(clicked()), SLOT(changed()));
connect( geometryTipOn, SIGNAL(clicked()), SLOT(changed()));
connect( minimizeAnimOn, SIGNAL(clicked() ), SLOT(changed()));
connect( minimizeAnimSlider, SIGNAL(valueChanged(int)), SLOT(changed()));
connect( moveResizeMaximized, SIGNAL(toggled(bool)), SLOT(changed()));
connect( placementCombo, SIGNAL(activated(int)), SLOT(changed()));
connect( BrdrSnap, SIGNAL(valueChanged(int)), SLOT(changed()));
@ -1038,29 +989,6 @@ void KMovingConfig::setPlacement(int plac)
placementCombo->setCurrentIndex(plac);
}
bool KMovingConfig::getMinimizeAnim()
{
return minimizeAnimOn->isChecked();
}
int KMovingConfig::getMinimizeAnimSpeed()
{
return minimizeAnimSlider->value();
}
void KMovingConfig::setMinimizeAnim(bool anim)
{
minimizeAnimOn->setChecked( anim );
minimizeAnimSlider->setEnabled( anim );
minimizeAnimSlowLabel->setEnabled( anim );
minimizeAnimFastLabel->setEnabled( anim );
}
void KMovingConfig::setMinimizeAnimSpeed(int speed)
{
minimizeAnimSlider->setValue(speed);
}
int KMovingConfig::getResizeOpaque()
{
return (resizeOpaqueOn->isChecked())? RESIZE_OPAQUE : RESIZE_TRANSPARENT;
@ -1095,14 +1023,6 @@ void KMovingConfig::load( void )
else if( key == "Opaque")
setMove(OPAQUE);
//CT 17Jun1998 - variable animation speed from 0 (none!!) to 10 (max)
bool anim = cg.readEntry(KWIN_MINIMIZE_ANIM, true);
int animSpeed = cg.readEntry(KWIN_MINIMIZE_ANIM_SPEED, 5);
if( animSpeed < 1 ) animSpeed = 0;
if( animSpeed > 10 ) animSpeed = 10;
setMinimizeAnim( anim );
setMinimizeAnimSpeed( animSpeed );
// DF: please keep the default consistent with kwin (options.cpp line 145)
key = cg.readEntry(KWIN_RESIZE_OPAQUE, "Opaque");
if( key == "Opaque")
@ -1203,9 +1123,6 @@ void KMovingConfig::save( void )
else
cg.writeEntry(KWIN_PLACEMENT, "Smart");
cg.writeEntry(KWIN_MINIMIZE_ANIM, getMinimizeAnim());
cg.writeEntry(KWIN_MINIMIZE_ANIM_SPEED, getMinimizeAnimSpeed());
v = getResizeOpaque();
if (v == RESIZE_OPAQUE)
cg.writeEntry(KWIN_RESIZE_OPAQUE, "Opaque");
@ -1243,8 +1160,6 @@ void KMovingConfig::defaults()
setBorderSnapZone(KWM_BRDR_SNAP_ZONE_DEFAULT);
OverlapSnap->setChecked(false);
setMinimizeAnim( true );
setMinimizeAnimSpeed( 5 );
emit KCModule::changed(true);
}

11
kcmkwin/kwinoptions/windows.h
View file

@ -141,16 +141,12 @@ public:
void defaults();
private slots:
void setMinimizeAnim( bool );
void setMinimizeAnimSpeed( int );
void changed() { emit KCModule::changed(true); }
void changed() { emit KCModule::changed(true); }
void slotBrdrSnapChanged( int );
void slotWndwSnapChanged( int );
private:
int getMove( void );
bool getMinimizeAnim( void );
int getMinimizeAnimSpeed( void );
int getResizeOpaque ( void );
bool getGeometryTip( void ); //KS
int getPlacement( void ); //CT
@ -165,9 +161,6 @@ private:
QCheckBox *opaque;
QCheckBox *resizeOpaqueOn;
QCheckBox *geometryTipOn;
QCheckBox* minimizeAnimOn;
QSlider *minimizeAnimSlider;
QLabel *minimizeAnimSlowLabel, *minimizeAnimFastLabel;
QCheckBox *moveResizeMaximized;
QComboBox *placementCombo;
@ -208,11 +201,9 @@ private slots:
private:
int getShadeHoverInterval (void );
void setAnimateShade(bool);
void setShadeHover(bool);
void setShadeHoverInterval(int);
QCheckBox *animateShade;
Q3ButtonGroup *shBox;
QCheckBox *shadeHoverOn;
KIntNumInput *shadeHover;

3
kwin.kcfg
View file

@ -36,15 +36,12 @@
<entry key="MoveMode" type="String" />
<entry key="ResizeMode" type="String" />
<entry key="TitlebarDoubleClickCommand" type="String" />
<entry key="AnimateMinimize" type="Bool" />
<entry key="AnimateShade" type="Bool" />
<entry key="IgnoreFocusStealingClasses" type="StringList" />
<entry key="MoveResizeMaximizedWindows" type="Bool" />
<entry key="ShadeHover" type="Bool" />
<entry key="GeometryTip" type="Bool" />
<entry key="RollOverDesktops" type="Bool" />
<entry key="FocusStealingPreventionLevel" type="Int" />
<entry key="AnimateMinimizeSpeed" type="Int" />
<entry key="Placement" type="String" />
<entry key="AutoRaise" type="Bool" />
<entry key="AutoRaiseInterval" type="Int" />

10
lib/kdecoration.cpp
View file

@ -308,21 +308,11 @@ bool KDecoration::drawbound( const QRect&, bool )
return false;
}
bool KDecoration::animateMinimize( bool )
{
return false;
}
bool KDecoration::windowDocked( Position )
{
return false;
}
void KDecoration::helperShowHide( bool show )
{
bridge_->helperShowHide( show );
}
void KDecoration::reset( unsigned long )
{
}

19
lib/kdecoration.h
View file

@ -662,18 +662,6 @@ class KWIN_EXPORT KDecoration
* @see geometry()
*/
virtual bool drawbound( const QRect& geom, bool clear );
/**
* This function may be reimplemented to provide custom minimize/restore animations
* The reimplementation is allowed to perform X server grabs if necessary
* (only using the functions provided by this API, no direct Xlib calls), but no
* futher event processing is allowed (i.e. no kapp->processEvents()).
* @a False should be returned if the default implementation should be used.
* Note that you should not use this function to force disabling of the animation.
* See @p drawbound() for details on how to do the painting.
*
* @see geometry() and helperShowHide().
*/
virtual bool animateMinimize( bool minimize );
/**
* @internal Reserved.
*/
@ -717,13 +705,6 @@ class KWIN_EXPORT KDecoration
* or WStyle_NoBorder are forbidden.
*/
Qt::WFlags initialWFlags() const;
/**
* This function is only allowed to be called once from animateMinimize().
* It can be used if the window should be shown or hidden at a specific
* time during the animation. It is forbidden to use this function
* for other purposes.
*/
void helperShowHide( bool show );
/**
* Returns the main widget for the decoration.
*/

1
lib/kdecoration_p.h
View file

@ -103,7 +103,6 @@ class KDecorationBridge : public KDecorationDefines
virtual int currentDesktop() const = 0;
virtual QWidget* initialParentWidget() const = 0;
virtual Qt::WFlags initialWFlags() const = 0;
virtual void helperShowHide( bool ) = 0;
virtual void grabXServer( bool grab ) = 0;
};

4
options.cpp
View file

@ -107,10 +107,6 @@ unsigned long Options::updateSettings()
xineramaPlacementScreen = qBound( -1, config.readEntry( "XineramaPlacementScreen", -1 ),
qApp->desktop()->numScreens() - 1 );
animateShade = config.readEntry("AnimateShade", true);
animateMinimize = config.readEntry("AnimateMinimize", true);
animateMinimizeSpeed = config.readEntry("AnimateMinimizeSpeed", 5 );
if( focusPolicy == ClickToFocus )
{
autoRaise = false;

15
options.h
View file

@ -161,11 +161,6 @@ class Options : public KDecorationOptions
return focusPolicy == ClickToFocus || focusPolicy == FocusFollowsMouse;
}
/**
* whether we animate the shading of windows to titlebar or not
*/
bool animateShade;
/**
* the size of the zone that triggers snapping on desktop borders
*/
@ -182,16 +177,6 @@ class Options : public KDecorationOptions
*/
bool snapOnlyWhenOverlapping;
/**
* whether we animate the minimization of windows or not
*/
bool animateMinimize;
/**
* Animation speed (0 .. 10 )
*/
int animateMinimizeSpeed;
bool showDesktopIsMinimizeAll;
/**

4
tools/decobenchmark/preview.cpp
View file

@ -378,10 +378,6 @@ int KDecorationPreviewBridge::currentDesktop() const
return 1;
}
void KDecorationPreviewBridge::helperShowHide( bool )
{
}
void KDecorationPreviewBridge::grabXServer( bool )
{
}

1
tools/decobenchmark/preview.h
View file

@ -101,7 +101,6 @@ class KDecorationPreviewBridge
virtual int currentDesktop() const;
virtual QWidget* initialParentWidget() const;
virtual Qt::WFlags initialWFlags() const;
virtual void helperShowHide( bool show );
virtual void grabXServer( bool grab );
private:
KDecorationPreview* preview;