Compiz

Merge lp:~3v1n0/compiz/scale-xy-offsets into lp:compiz/0.9.11

  1. scale-xy-offsets
  2. Merge into 0.9.11
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 3824
Merged at revision: 3829
Proposed branch: lp:~3v1n0/compiz/scale-xy-offsets
Merge into: lp:compiz/0.9.11
Diff against target: 393 lines (+91/-74)
3 files modified
debian/patches/ubuntu-config.patch (+59/-58)
plugins/scale/scale.xml.in (+12/-0)
plugins/scale/src/scale.cpp (+20/-16)
To merge this branch: bzr merge lp:~3v1n0/compiz/scale-xy-offsets
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Andrea Azzarone Approve
Review via email: mp+206748@code.launchpad.net

Commit message

Scale: add {x,y_offset} options so we can move the scale despite the workarea

Description of the change

Add options to move the spread of a given x,y offset... This is needed in case we have an auto-hidden launcher in unity, so that we don't have a restricted workarea geometry and events over the panel would be grabbed.

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3822
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/33/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/33/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/33/rebuild

review: Needs Fixing (continuous-integration)
lp:~3v1n0/compiz/scale-xy-offsets updated
3823. By Marco Trevisan (Treviño)

UbuntuConfig: refresh the patch to match current scale.xml.in

3824. By Marco Trevisan (Treviño)

Scale: set minimum offset value to 0

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3824
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/34

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/34/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/patches/ubuntu-config.patch'
--- debian/patches/ubuntu-config.patch 2013-12-04 19:21:12 +0000
+++ debian/patches/ubuntu-config.patch 2014-02-17 20:36:48 +0000
@@ -1,8 +1,8 @@
1=== modified file 'metadata/core.xml.in'1=== modified file 'metadata/core.xml.in'
2Index: compiz/metadata/core.xml.in2Index: scale-xy-offsets/metadata/core.xml.in
3===================================================================3===================================================================
4--- compiz.orig/metadata/core.xml.in 2013-10-08 17:00:56.932757923 +02004--- scale-xy-offsets.orig/metadata/core.xml.in 2014-02-17 21:25:57.420121366 +0100
5+++ compiz/metadata/core.xml.in 2013-10-08 17:00:56.916757966 +02005+++ scale-xy-offsets/metadata/core.xml.in 2014-02-17 21:25:57.408121419 +0100
6@@ -139,7 +139,7 @@6@@ -139,7 +139,7 @@
7 <option name="focus_prevention_match" type="match">7 <option name="focus_prevention_match" type="match">
8 <_short>Focus Prevention Windows</_short>8 <_short>Focus Prevention Windows</_short>
@@ -65,10 +65,10 @@
65 <min>1</min>65 <min>1</min>
66 <max>32</max>66 <max>32</max>
67 </option>67 </option>
68Index: compiz/plugins/animation/animation.xml.in68Index: scale-xy-offsets/plugins/animation/animation.xml.in
69===================================================================69===================================================================
70--- compiz.orig/plugins/animation/animation.xml.in 2013-10-08 17:00:56.932757923 +020070--- scale-xy-offsets.orig/plugins/animation/animation.xml.in 2014-02-17 21:25:57.420121366 +0100
71+++ compiz/plugins/animation/animation.xml.in 2013-10-08 17:00:56.920757955 +020071+++ scale-xy-offsets/plugins/animation/animation.xml.in 2014-02-17 21:25:57.408121419 +0100
72@@ -36,7 +36,7 @@72@@ -36,7 +36,7 @@
73 <extensible/>73 <extensible/>
74 <sort start="2"/>74 <sort start="2"/>
@@ -207,10 +207,10 @@
207 <min>0</min>207 <min>0</min>
208 <max>1</max>208 <max>1</max>
209 <precision>0.01</precision>209 <precision>0.01</precision>
210Index: compiz/plugins/decor/decor.xml.in210Index: scale-xy-offsets/plugins/decor/decor.xml.in
211===================================================================211===================================================================
212--- compiz.orig/plugins/decor/decor.xml.in 2013-10-08 17:00:56.932757923 +0200212--- scale-xy-offsets.orig/plugins/decor/decor.xml.in 2014-02-17 21:25:57.420121366 +0100
213+++ compiz/plugins/decor/decor.xml.in 2013-10-08 17:00:56.920757955 +0200213+++ scale-xy-offsets/plugins/decor/decor.xml.in 2014-02-17 21:25:57.412121402 +0100
214@@ -31,7 +31,7 @@214@@ -31,7 +31,7 @@
215 <option name="active_shadow_opacity" type="float">215 <option name="active_shadow_opacity" type="float">
216 <_short>Shadow Opacity</_short>216 <_short>Shadow Opacity</_short>
@@ -247,10 +247,10 @@
247 </option>247 </option>
248 <option name="mipmap" type="bool">248 <option name="mipmap" type="bool">
249 <_short>Mipmap</_short>249 <_short>Mipmap</_short>
250Index: compiz/plugins/fade/fade.xml.in250Index: scale-xy-offsets/plugins/fade/fade.xml.in
251===================================================================251===================================================================
252--- compiz.orig/plugins/fade/fade.xml.in 2013-10-08 17:00:56.932757923 +0200252--- scale-xy-offsets.orig/plugins/fade/fade.xml.in 2014-02-17 21:25:57.420121366 +0100
253+++ compiz/plugins/fade/fade.xml.in 2013-10-08 17:00:56.920757955 +0200253+++ scale-xy-offsets/plugins/fade/fade.xml.in 2014-02-17 21:25:57.412121402 +0100
254@@ -10,6 +10,7 @@254@@ -10,6 +10,7 @@
255 </requirement>255 </requirement>
256 <relation type="after">256 <relation type="after">
@@ -268,10 +268,10 @@
268 </option>268 </option>
269 <option name="visual_bell" type="bell">269 <option name="visual_bell" type="bell">
270 <_short>Visual Bell</_short>270 <_short>Visual Bell</_short>
271Index: compiz/plugins/gnomecompat/gnomecompat.xml.in271Index: scale-xy-offsets/plugins/gnomecompat/gnomecompat.xml.in
272===================================================================272===================================================================
273--- compiz.orig/plugins/gnomecompat/gnomecompat.xml.in 2013-10-08 17:00:56.932757923 +0200273--- scale-xy-offsets.orig/plugins/gnomecompat/gnomecompat.xml.in 2014-02-17 21:25:57.420121366 +0100
274+++ compiz/plugins/gnomecompat/gnomecompat.xml.in 2013-10-08 17:00:56.920757955 +0200274+++ scale-xy-offsets/plugins/gnomecompat/gnomecompat.xml.in 2014-02-17 21:25:57.412121402 +0100
275@@ -53,6 +53,7 @@275@@ -53,6 +53,7 @@
276 <option name="run_command_terminal_key" type="key">276 <option name="run_command_terminal_key" type="key">
277 <_short>Open a terminal</_short>277 <_short>Open a terminal</_short>
@@ -280,10 +280,10 @@
280 </option>280 </option>
281 </group>281 </group>
282 </options>282 </options>
283Index: compiz/plugins/place/place.xml.in283Index: scale-xy-offsets/plugins/place/place.xml.in
284===================================================================284===================================================================
285--- compiz.orig/plugins/place/place.xml.in 2013-10-08 17:00:56.932757923 +0200285--- scale-xy-offsets.orig/plugins/place/place.xml.in 2014-02-17 21:25:57.420121366 +0100
286+++ compiz/plugins/place/place.xml.in 2013-10-08 17:00:56.920757955 +0200286+++ scale-xy-offsets/plugins/place/place.xml.in 2014-02-17 21:25:57.412121402 +0100
287@@ -20,8 +20,8 @@287@@ -20,8 +20,8 @@
288 <option name="mode" type="int">288 <option name="mode" type="int">
289 <_short>Placement Mode</_short>289 <_short>Placement Mode</_short>
@@ -295,10 +295,10 @@
295 <max>5</max>295 <max>5</max>
296 <desc>296 <desc>
297 <value>0</value>297 <value>0</value>
298Index: compiz/plugins/resize/resize.xml.in298Index: scale-xy-offsets/plugins/resize/resize.xml.in
299===================================================================299===================================================================
300--- compiz.orig/plugins/resize/resize.xml.in 2013-10-08 17:00:56.932757923 +0200300--- scale-xy-offsets.orig/plugins/resize/resize.xml.in 2014-02-17 21:25:57.420121366 +0100
301+++ compiz/plugins/resize/resize.xml.in 2013-10-08 17:00:56.920757955 +0200301+++ scale-xy-offsets/plugins/resize/resize.xml.in 2014-02-17 21:25:57.412121402 +0100
302@@ -28,7 +28,7 @@302@@ -28,7 +28,7 @@
303 <option name="mode" type="int">303 <option name="mode" type="int">
304 <_short>Default Resize Mode</_short>304 <_short>Default Resize Mode</_short>
@@ -343,11 +343,11 @@
343 </default>343 </default>
344 </option>344 </option>
345 <subgroup>345 <subgroup>
346Index: compiz/plugins/scale/scale.xml.in346Index: scale-xy-offsets/plugins/scale/scale.xml.in
347===================================================================347===================================================================
348--- compiz.orig/plugins/scale/scale.xml.in 2013-10-08 17:00:56.932757923 +0200348--- scale-xy-offsets.orig/plugins/scale/scale.xml.in 2014-02-17 21:25:57.420121366 +0100
349+++ compiz/plugins/scale/scale.xml.in 2013-10-08 17:00:56.920757955 +0200349+++ scale-xy-offsets/plugins/scale/scale.xml.in 2014-02-17 21:31:47.058611881 +0100
350@@ -19,14 +19,14 @@350@@ -19,7 +19,7 @@
351 <option name="spacing" type="int">351 <option name="spacing" type="int">
352 <_short>Spacing</_short>352 <_short>Spacing</_short>
353 <_long>Space between windows</_long>353 <_long>Space between windows</_long>
@@ -356,6 +356,7 @@
356 <min>0</min>356 <min>0</min>
357 <max>250</max>357 <max>250</max>
358 </option>358 </option>
359@@ -36,7 +36,7 @@
359 <option name="speed" type="float">360 <option name="speed" type="float">
360 <_short>Speed</_short>361 <_short>Speed</_short>
361 <_long>Scale speed</_long>362 <_long>Scale speed</_long>
@@ -364,7 +365,7 @@
364 <min>0.1</min>365 <min>0.1</min>
365 <max>50</max>366 <max>50</max>
366 <precision>0.1</precision>367 <precision>0.1</precision>
367@@ -34,7 +34,7 @@368@@ -44,7 +44,7 @@
368 <option name="timestep" type="float">369 <option name="timestep" type="float">
369 <_short>Timestep</_short>370 <_short>Timestep</_short>
370 <_long>Scale timestep</_long>371 <_long>Scale timestep</_long>
@@ -373,7 +374,7 @@
373 <min>0.1</min>374 <min>0.1</min>
374 <max>50</max>375 <max>50</max>
375 <precision>0.1</precision>376 <precision>0.1</precision>
376@@ -47,7 +47,7 @@377@@ -57,7 +57,7 @@
377 <option name="opacity" type="int">378 <option name="opacity" type="int">
378 <_short>Opacity</_short>379 <_short>Opacity</_short>
379 <_long>Amount of opacity in percent</_long>380 <_long>Amount of opacity in percent</_long>
@@ -382,7 +383,7 @@
382 <min>0</min>383 <min>0</min>
383 <max>100</max>384 <max>100</max>
384 </option>385 </option>
385@@ -56,7 +56,7 @@386@@ -66,7 +66,7 @@
386 <_long>Overlay an icon on windows once they are scaled</_long>387 <_long>Overlay an icon on windows once they are scaled</_long>
387 <min>0</min>388 <min>0</min>
388 <max>2</max>389 <max>2</max>
@@ -391,7 +392,7 @@
391 <desc>392 <desc>
392 <value>0</value>393 <value>0</value>
393 <_name>None</_name>394 <_name>None</_name>
394@@ -97,7 +97,7 @@395@@ -107,7 +107,7 @@
395 <_long>Selects where windows are scaled if multiple output devices are used.</_long>396 <_long>Selects where windows are scaled if multiple output devices are used.</_long>
396 <min>0</min>397 <min>0</min>
397 <max>1</max>398 <max>1</max>
@@ -400,7 +401,7 @@
400 <desc>401 <desc>
401 <value>0</value>402 <value>0</value>
402 <_name>On current output device</_name>403 <_name>On current output device</_name>
403@@ -113,7 +113,7 @@404@@ -123,7 +123,7 @@
404 <option name="key_bindings_toggle" type="bool">405 <option name="key_bindings_toggle" type="bool">
405 <_short>Key Bindings Toggle Scale Mode</_short>406 <_short>Key Bindings Toggle Scale Mode</_short>
406 <_long>Key bindings toggle scale mode instead of enabling it when pressed and disabling it when released.</_long>407 <_long>Key bindings toggle scale mode instead of enabling it when pressed and disabling it when released.</_long>
@@ -409,7 +410,7 @@
409 </option>410 </option>
410 <option name="button_bindings_toggle" type="bool">411 <option name="button_bindings_toggle" type="bool">
411 <_short>Button Bindings Toggle Scale Mode</_short>412 <_short>Button Bindings Toggle Scale Mode</_short>
412@@ -123,15 +123,12 @@413@@ -133,15 +133,12 @@
413 <option name="initiate_edge" type="edge">414 <option name="initiate_edge" type="edge">
414 <_short>Initiate Window Picker</_short>415 <_short>Initiate Window Picker</_short>
415 <_long>Layout and start transforming windows</_long>416 <_long>Layout and start transforming windows</_long>
@@ -426,10 +427,10 @@
426 </option>427 </option>
427 <option name="initiate_button" type="button">428 <option name="initiate_button" type="button">
428 <_short>Initiate Window Picker</_short>429 <_short>Initiate Window Picker</_short>
429Index: compiz/plugins/staticswitcher/staticswitcher.xml.in430Index: scale-xy-offsets/plugins/staticswitcher/staticswitcher.xml.in
430===================================================================431===================================================================
431--- compiz.orig/plugins/staticswitcher/staticswitcher.xml.in 2013-10-08 17:00:56.932757923 +0200432--- scale-xy-offsets.orig/plugins/staticswitcher/staticswitcher.xml.in 2014-02-17 21:25:57.420121366 +0100
432+++ compiz/plugins/staticswitcher/staticswitcher.xml.in 2013-10-08 17:00:56.920757955 +0200433+++ scale-xy-offsets/plugins/staticswitcher/staticswitcher.xml.in 2014-02-17 21:25:57.412121402 +0100
433@@ -11,7 +11,6 @@434@@ -11,7 +11,6 @@
434 <relation type="after">435 <relation type="after">
435 <plugin>composite</plugin>436 <plugin>composite</plugin>
@@ -506,10 +507,10 @@
506 <desc>507 <desc>
507 <value>0</value>508 <value>0</value>
508 <_name>None</_name>509 <_name>None</_name>
509Index: compiz/plugins/vpswitch/vpswitch.xml.in510Index: scale-xy-offsets/plugins/vpswitch/vpswitch.xml.in
510===================================================================511===================================================================
511--- compiz.orig/plugins/vpswitch/vpswitch.xml.in 2013-10-08 17:00:56.932757923 +0200512--- scale-xy-offsets.orig/plugins/vpswitch/vpswitch.xml.in 2014-02-17 21:25:57.420121366 +0100
512+++ compiz/plugins/vpswitch/vpswitch.xml.in 2013-10-08 17:00:56.924757944 +0200513+++ scale-xy-offsets/plugins/vpswitch/vpswitch.xml.in 2014-02-17 21:25:57.412121402 +0100
513@@ -95,13 +95,11 @@514@@ -95,13 +95,11 @@
514 <option name="next_button" type="button">515 <option name="next_button" type="button">
515 <_short>Move Next</_short>516 <_short>Move Next</_short>
@@ -524,10 +525,10 @@
524 <internal/>525 <internal/>
525 </option>526 </option>
526 <option name="initiate_button" type="button">527 <option name="initiate_button" type="button">
527Index: compiz/plugins/wall/wall.xml.in528Index: scale-xy-offsets/plugins/wall/wall.xml.in
528===================================================================529===================================================================
529--- compiz.orig/plugins/wall/wall.xml.in 2013-10-08 17:00:56.932757923 +0200530--- scale-xy-offsets.orig/plugins/wall/wall.xml.in 2014-02-17 21:25:57.420121366 +0100
530+++ compiz/plugins/wall/wall.xml.in 2013-10-08 17:00:56.924757944 +0200531+++ scale-xy-offsets/plugins/wall/wall.xml.in 2014-02-17 21:25:57.416121383 +0100
531@@ -30,12 +30,12 @@532@@ -30,12 +30,12 @@
532 <option name="miniscreen" type="bool">533 <option name="miniscreen" type="bool">
533 <_short>Show Live Viewport Previews</_short>534 <_short>Show Live Viewport Previews</_short>
@@ -684,10 +685,10 @@
684 </option>685 </option>
685 <option name="edgeflip_dnd" type="bool">686 <option name="edgeflip_dnd" type="bool">
686 <_short>Edge Flip DnD</_short>687 <_short>Edge Flip DnD</_short>
687Index: compiz/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp688Index: scale-xy-offsets/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
688===================================================================689===================================================================
689--- compiz.orig/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2013-10-08 17:00:56.932757923 +0200690--- scale-xy-offsets.orig/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2014-02-17 21:25:57.420121366 +0100
690+++ compiz/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2013-10-08 17:00:56.924757944 +0200691+++ scale-xy-offsets/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2014-02-17 21:25:57.416121383 +0100
691@@ -46,7 +46,7 @@692@@ -46,7 +46,7 @@
692 693
693 namespace694 namespace
@@ -697,10 +698,10 @@
697 unsigned int DEFAULT_VIEWPORT_HEIGHT = 1;698 unsigned int DEFAULT_VIEWPORT_HEIGHT = 1;
698 699
699 bool Advance (Display *d, bool r)700 bool Advance (Display *d, bool r)
700Index: compiz/plugins/grid/grid.xml.in701Index: scale-xy-offsets/plugins/grid/grid.xml.in
701===================================================================702===================================================================
702--- compiz.orig/plugins/grid/grid.xml.in 2013-12-04 12:23:44.021963832 -0500703--- scale-xy-offsets.orig/plugins/grid/grid.xml.in 2014-02-17 21:25:57.420121366 +0100
703+++ compiz/plugins/grid/grid.xml.in 2013-12-04 12:24:43.885963254 -0500704+++ scale-xy-offsets/plugins/grid/grid.xml.in 2014-02-17 21:25:57.416121383 +0100
704@@ -68,12 +68,12 @@705@@ -68,12 +68,12 @@
705 <option name="put_maximize_key" type="key">706 <option name="put_maximize_key" type="key">
706 <_short>Maximize Key</_short>707 <_short>Maximize Key</_short>
@@ -716,10 +717,10 @@
716 </option>717 </option>
717 <option name="left_maximize" type="key">718 <option name="left_maximize" type="key">
718 <_short>Left Maximize</_short>719 <_short>Left Maximize</_short>
719Index: compiz/plugins/ezoom/ezoom.xml.in720Index: scale-xy-offsets/plugins/ezoom/ezoom.xml.in
720===================================================================721===================================================================
721--- compiz.orig/plugins/ezoom/ezoom.xml.in 2013-10-08 17:00:56.932757923 +0200722--- scale-xy-offsets.orig/plugins/ezoom/ezoom.xml.in 2014-02-17 21:25:57.420121366 +0100
722+++ compiz/plugins/ezoom/ezoom.xml.in 2013-10-08 17:00:56.924757944 +0200723+++ scale-xy-offsets/plugins/ezoom/ezoom.xml.in 2014-02-17 21:25:57.416121383 +0100
723@@ -30,7 +30,7 @@724@@ -30,7 +30,7 @@
724 <option type="button" name="zoom_in_button">725 <option type="button" name="zoom_in_button">
725 <_short>Zoom In Button</_short>726 <_short>Zoom In Button</_short>
@@ -756,10 +757,10 @@
756 </option>757 </option>
757 </subgroup>758 </subgroup>
758 </group>759 </group>
759Index: compiz/plugins/expo/expo.xml.in760Index: scale-xy-offsets/plugins/expo/expo.xml.in
760===================================================================761===================================================================
761--- compiz.orig/plugins/expo/expo.xml.in 2013-10-08 17:00:56.932757923 +0200762--- scale-xy-offsets.orig/plugins/expo/expo.xml.in 2014-02-17 21:25:57.420121366 +0100
762+++ compiz/plugins/expo/expo.xml.in 2013-10-08 17:00:56.924757944 +0200763+++ scale-xy-offsets/plugins/expo/expo.xml.in 2014-02-17 21:25:57.416121383 +0100
763@@ -17,6 +17,7 @@764@@ -17,6 +17,7 @@
764 <plugin>wobbly</plugin>765 <plugin>wobbly</plugin>
765 <plugin>animation</plugin>766 <plugin>animation</plugin>
@@ -854,10 +855,10 @@
854 </option>855 </option>
855 <option name="ground_color1" type="color">856 <option name="ground_color1" type="color">
856 <_short>Ground Color (near)</_short>857 <_short>Ground Color (near)</_short>
857Index: compiz/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml858Index: scale-xy-offsets/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
858===================================================================859===================================================================
859--- compiz.orig/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2013-10-08 17:00:56.932757923 +0200860--- scale-xy-offsets.orig/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2014-02-17 21:25:57.420121366 +0100
860+++ compiz/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2013-10-08 17:00:56.924757944 +0200861+++ scale-xy-offsets/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2014-02-17 21:25:57.416121383 +0100
861@@ -10,6 +10,9 @@862@@ -10,6 +10,9 @@
862 <key type="s" name="command-screenshot">863 <key type="s" name="command-screenshot">
863 <default>"gnome-screenshot"</default>864 <default>"gnome-screenshot"</default>
@@ -878,10 +879,10 @@
878 <key type="s" name="command-12">879 <key type="s" name="command-12">
879 <default>""</default>880 <default>""</default>
880 </key>881 </key>
881Index: compiz/plugins/commands/commands.xml.in882Index: scale-xy-offsets/plugins/commands/commands.xml.in
882===================================================================883===================================================================
883--- compiz.orig/plugins/commands/commands.xml.in 2013-10-08 17:00:56.932757923 +0200884--- scale-xy-offsets.orig/plugins/commands/commands.xml.in 2014-02-17 21:25:57.420121366 +0100
884+++ compiz/plugins/commands/commands.xml.in 2013-10-08 17:00:56.924757944 +0200885+++ scale-xy-offsets/plugins/commands/commands.xml.in 2014-02-17 21:25:57.416121383 +0100
885@@ -117,7 +117,7 @@886@@ -117,7 +117,7 @@
886 <option name="command20" type="string">887 <option name="command20" type="string">
887 <_short>Command line 20</_short>888 <_short>Command line 20</_short>
888889
=== modified file 'plugins/scale/scale.xml.in'
--- plugins/scale/scale.xml.in 2013-11-11 20:07:16 +0000
+++ plugins/scale/scale.xml.in 2014-02-17 20:36:48 +0000
@@ -23,6 +23,18 @@
23 <min>0</min>23 <min>0</min>
24 <max>250</max>24 <max>250</max>
25 </option>25 </option>
26 <option name="x_offset" type="int">
27 <_short>X Offset</_short>
28 <_long>Horizontal offset (in pixels).</_long>
29 <min>0</min>
30 <default>0</default>
31 </option>
32 <option name="y_offset" type="int">
33 <_short>Y Offset</_short>
34 <_long>Vertical offset (in pixels).</_long>
35 <min>0</min>
36 <default>0</default>
37 </option>
26 <option name="speed" type="float">38 <option name="speed" type="float">
27 <_short>Speed</_short>39 <_short>Speed</_short>
28 <_long>Scale speed</_long>40 <_long>Scale speed</_long>
2941
=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp 2013-11-11 20:07:16 +0000
+++ plugins/scale/src/scale.cpp 2014-02-17 20:36:48 +0000
@@ -435,15 +435,15 @@
435 int spacing = optionGetSpacing ();435 int spacing = optionGetSpacing ();
436 int nSlots = 0;436 int nSlots = 0;
437437
438 y = workArea.y () + spacing;438 y = optionGetYOffset() + workArea.y () + spacing;
439 height = (workArea.height () - (lines + 1) * spacing) / lines;439 height = (workArea.height () - optionGetYOffset() - (lines + 1) * spacing) / lines;
440440
441 for (int i = 0; i < lines; i++)441 for (int i = 0; i < lines; i++)
442 {442 {
443 n = MIN (nWindows - nSlots, ceilf ((float) nWindows / lines));443 n = MIN (nWindows - nSlots, ceilf ((float) nWindows / lines));
444444
445 x = workArea.x () + spacing;445 x = optionGetXOffset() + workArea.x () + spacing;
446 width = (workArea.width () - (n + 1) * spacing) / n;446 width = (workArea.width () - optionGetXOffset() - (n + 1) * spacing) / n;
447447
448 for (int j = 0; j < n; j++)448 for (int j = 0; j < n; j++)
449 {449 {
@@ -1614,6 +1614,8 @@
1614 {1614 {
1615 CompPoint pointer (button->x_root, button->y_root);1615 CompPoint pointer (button->x_root, button->y_root);
1616 CompRect workArea (screen->workArea ());1616 CompRect workArea (screen->workArea ());
1617 workArea.setX (workArea.x() + optionGetXOffset ());
1618 workArea.setY (workArea.y() + optionGetYOffset ());
16171619
1618 if (workArea.contains (pointer))1620 if (workArea.contains (pointer))
1619 {1621 {
@@ -1622,19 +1624,21 @@
1622 screen->enterShowDesktopMode ();1624 screen->enterShowDesktopMode ();
1623 }1625 }
1624 }1626 }
1625 else if (optionGetClickOnDesktop () == 2 &&1627 else if (optionGetClickOnDesktop () == 2 &&
1626 event->xbutton.button == Button1)1628 event->xbutton.button == Button1)
1627 {1629 {
1628 CompPoint pointer (button->x_root, button->y_root);1630 CompPoint pointer (button->x_root, button->y_root);
1629 CompRect workArea (screen->workArea ());1631 CompRect workArea (screen->workArea ());
1632 workArea.setX (workArea.x() + optionGetXOffset ());
1633 workArea.setY (workArea.y() + optionGetYOffset ());
16301634
1631 if (workArea.contains (pointer))1635 if (workArea.contains (pointer))
1632 {1636 {
1633 scaleTerminate (&optionGetInitiateEdge (), 0, o);1637 scaleTerminate (&optionGetInitiateEdge (), 0, o);
1634 scaleTerminate (&optionGetInitiateKey (), 0, o);1638 scaleTerminate (&optionGetInitiateKey (), 0, o);
1635 }1639 }
1636 }1640 }
1637 }1641 }
1638 break;1642 break;
1639 case MotionNotify:1643 case MotionNotify:
1640 if (screen->root () == event->xmotion.root &&1644 if (screen->root () == event->xmotion.root &&

Subscribers

People subscribed via source and target branches