diff options
| author | Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> | 2013-12-12 09:40:14 +0100 |
|---|---|---|
| committer | Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> | 2013-12-12 09:40:14 +0100 |
| commit | 32337d3fa001f2fdea64c436c78d91d48ccadd38 (patch) | |
| tree | 24ea9d1445fac87531b1cfe2a206fa5609d63d2e | |
| parent | 648537cffa9ab60e2e1a8444f2f4da7ac9eca47b (diff) | |
| parent | ce5f008584302362f6374201432f91e3d950715d (diff) | |
| download | xfwm4-32337d3fa001f2fdea64c436c78d91d48ccadd38.tar.gz | |
Merge branch 'master' into ochosi/tabwin
| -rw-r--r-- | src/compositor.c | 2 | ||||
| -rw-r--r-- | src/events.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/compositor.c b/src/compositor.c index 01ff05f6e..843ce65c9 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -3056,6 +3056,8 @@ compositorZoomIn (ScreenInfo *screen_info, XButtonEvent *ev) if (screen_info->display_info->have_xrandr) { timeout_rate = screen_info->refresh_rate/2; + if(timeout_rate < 1) + timeout_rate = 30; } #endif /* HAVE_RANDR */ screen_info->zoom_timeout_id = g_timeout_add ((1000/timeout_rate), zoom_timeout_cb, screen_info); diff --git a/src/events.c b/src/events.c index e70ca1629..ccdb2a52c 100644 --- a/src/events.c +++ b/src/events.c @@ -904,11 +904,13 @@ handleButtonPress (DisplayInfo *display_info, XButtonEvent * ev) edgeButton (c, part, ev); } #ifdef HAVE_COMPOSITOR - else if ((ev->button == Button4) && (state) && (state == screen_info->params->easy_click)) + else if ((ev->button == Button4) && (state) && (state == screen_info->params->easy_click) + && (screen_info->compositor_active)) { compositorZoomIn(screen_info, ev); } - else if ((ev->button == Button5) && (state) && (state == screen_info->params->easy_click)) + else if ((ev->button == Button5) && (state) && (state == screen_info->params->easy_click) + && (screen_info->compositor_active)) { compositorZoomOut(screen_info, ev); } |