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

Tune electric borders...

Browse source 
svn path=/trunk/kdebase/kwin/; revision=113523
This commit is contained in:
Waldo Bastian 2001-09-06 19:44:06 +00:00
parent 827e9b92be
commit 7d5e50bab8
3 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
options.cpp
View file

@ -20,7 +20,8 @@ class OptionsPrivate
{ {
public: public:
OptionsPrivate() : title_buttons_left( "MS" ), title_buttons_right( "HIAX" ), OptionsPrivate() : title_buttons_left( "MS" ), title_buttons_right( "HIAX" ),
custom_button_positions( false ), electric_borders( false ) {}; custom_button_positions( false ), electric_borders( false ),
electric_border_delay(0) {};
QColor colors[KWINCOLORS*2]; QColor colors[KWINCOLORS*2];
QColorGroup *cg[KWINCOLORS*2]; QColorGroup *cg[KWINCOLORS*2];
QString title_buttons_left; QString title_buttons_left;
@ -30,6 +31,7 @@ public:
bool fade_tooltips; bool fade_tooltips;
bool animate_tooltips; bool animate_tooltips;
bool electric_borders; bool electric_borders;
int electric_border_delay;
}; };
}; };
@ -220,6 +222,7 @@ void Options::reload()
windowSnapZone = config->readNumEntry("WindowSnapZone", 10); windowSnapZone = config->readNumEntry("WindowSnapZone", 10);
snapOnlyWhenOverlapping=config->readBoolEntry("SnapOnlyWhenOverlapping",FALSE); snapOnlyWhenOverlapping=config->readBoolEntry("SnapOnlyWhenOverlapping",FALSE);
d->electric_borders = config->readBoolEntry("ElectricBorders", false); d->electric_borders = config->readBoolEntry("ElectricBorders", false);
d->electric_border_delay = config->readNumEntry("ElectricBorderDelay", 150);
OpTitlebarDblClick = windowOperation( config->readEntry("TitlebarDoubleClickCommand", "Shade") ); OpTitlebarDblClick = windowOperation( config->readEntry("TitlebarDoubleClickCommand", "Shade") );
@ -357,5 +360,10 @@ bool Options::electricBorders()
return d->electric_borders; return d->electric_borders;
} }
int Options::electricBorderDelay()
{
return d->electric_border_delay;
}
#include "options.moc" #include "options.moc"

5
options.h
View file

@ -316,6 +316,11 @@ public:
*/ */
bool electricBorders(); bool electricBorders();
/**
* @returns the activation delay for electric borders in milliseconds.
*/
int electricBorderDelay();
public slots: public slots:
void reload(); void reload();

11
workspace.cpp
View file

@ -116,6 +116,7 @@ public:
WId electric_right_border; WId electric_right_border;
Time electric_time_first; Time electric_time_first;
Time electric_time_last; Time electric_time_last;
QPoint electric_push_point;
Client *movingClient; Client *movingClient;
}; };
@ -4215,11 +4216,14 @@ void Workspace::electricBorder(XEvent *e)
{ {
Window border = e->xcrossing.window; Window border = e->xcrossing.window;
Time now = e->xcrossing.time; Time now = e->xcrossing.time;
int treshold_set = 150; // set timeout int treshold_set = options->electricBorderDelay(); // set timeout
int treshold_reset = 150; // reset timeout int treshold_reset = 250; // reset timeout
int distance_reset = 10; // Mouse should not move more than this many pixels
QPoint p(e->xcrossing.x_root, e->xcrossing.y_root);
if ((d->electric_current_border == border) && if ((d->electric_current_border == border) &&
(TimeDiff(d->electric_time_last, now) < treshold_reset)) (TimeDiff(d->electric_time_last, now) < treshold_reset) &&
((p-d->electric_push_point).manhattanLength() < distance_reset))
{ {
d->electric_time_last = now; d->electric_time_last = now;
@ -4257,6 +4261,7 @@ void Workspace::electricBorder(XEvent *e)
d->electric_current_border = border; d->electric_current_border = border;
d->electric_time_first = now; d->electric_time_first = now;
d->electric_time_last = now; d->electric_time_last = now;
d->electric_push_point = p;
} }
int mouse_warp = 1; int mouse_warp = 1;