Merge lp:~hikiko/compiz/compiz.shodesktop-skip-anim-option into lp:compiz/0.9.13

Proposed by Eleni Maria Stea
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 4048
Merged at revision: 4068
Proposed branch: lp:~hikiko/compiz/compiz.shodesktop-skip-anim-option
Merge into: lp:compiz/0.9.13
Diff against target: 56 lines (+23/-4)
3 files modified
debian/unity-lowgfx.ini (+3/-0)
plugins/showdesktop/showdesktop.xml.in (+5/-0)
plugins/showdesktop/src/showdesktop.cpp (+15/-4)
To merge this branch: bzr merge lp:~hikiko/compiz/compiz.shodesktop-skip-anim-option
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot continuous-integration Pending
Unity Team Pending
Review via email: mp+299276@code.launchpad.net

Commit message

Added a new option in show desktop plugin that skips the fade animation: useful when performance is more important than eyecandy.

Description of the change

Added a new option in show desktop plugin that skips the fade animation: useful when performance is more important than eyecandy.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Ah, I forgot... Can you set this value as true by default in the unity-lowgfx.ini profile?

4048. By Eleni Maria Stea

merged to trunk + add option in unity-lowgfx.ini for showdesktop plugin

[ Eleni Maria Stea ]
* Added options for no animation in expo and scale plugins. They skip
  the intermediate fading steps that force several redraws.
[ Marco Trevisan (Treviño) ]
* Composite: use C++ goodness for managing damaging rectangles
* debian: add unity-lowgfx profile to compizconfig (LP: #1598770)
[ Marco Trevisan (Treviño) ]
* New upstream release 0.9.13.0
[ Sam Spilsbury <email address hidden> ]
* animationaddon: Port the animationaddon plugin to use modern GL API.
[ Alberts Muktupāvels ]
* gtk-window-decorator: add new metacity-theme-type setting in
  GWDSettings.
* gtk-window-decorator: stop using meta_frame_type_from_string.
* gtk-window-decorator: more code cleanup.
* gtk-window-decorator: improve titlebar font handling.
* gtk-window-decorator: use only one style window.
* gtk-window-decorator: improve Metacity theme.
* gtk-window-decorator: support Metacity 3.20.
[ Eleni Maria Stea ]
* removed a line that includes a missing header file and breaks the
  build
[ Graham Inggs ]
* Move libjpeg8-dev to libjpeg-dev
[ Gianfranco Costamagna ]
* Move libpng12-dev to libpng-dev, to ease libpng12 removal.
* Move libjpeg8-dev to libjpeg-dev and libpng12-dev to libpng-dev, to
  ease libpng12 removal
[ Alberts Muktupāvels ]
* gtk-window-decorator: remove broken 2D decoration mode.
* gtk-window-decorator: replace get_title_scale with
  update_titlebar_font_size.
* gtk-window-decorator: improve GWDSettingsStorage
[ Marco Trevisan (Treviño) ]
* showmouse: add mouse vertical and horizontal guides (LP: #1541059)

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/unity-lowgfx.ini'
--- debian/unity-lowgfx.ini 2016-07-04 10:12:34 +0000
+++ debian/unity-lowgfx.ini 2016-07-12 13:59:02 +0000
@@ -42,3 +42,6 @@
4242
43[wall]43[wall]
44s0_slide_duration = 044s0_slide_duration = 0
45
46[showdesktop]
47s0_skip_animation = true
4548
=== modified file 'plugins/showdesktop/showdesktop.xml.in'
--- plugins/showdesktop/showdesktop.xml.in 2013-04-27 15:56:23 +0000
+++ plugins/showdesktop/showdesktop.xml.in 2016-07-12 13:59:02 +0000
@@ -100,6 +100,11 @@
100 <_long>Window types that should be moved out of sight when entering showdesktop-mode.</_long>100 <_long>Window types that should be moved out of sight when entering showdesktop-mode.</_long>
101 <default>type=toolbar | type=utility | type=dialog | type=normal</default>101 <default>type=toolbar | type=utility | type=dialog | type=normal</default>
102 </option>102 </option>
103 <option name="skip_animation" type="bool">
104 <_short>Skip Animation</_short>
105 <_long>Skips the showdesktop animation.</_long>
106 <default>false</default>
107 </option>
103 </group>108 </group>
104 <group>109 <group>
105 <_short>Appearance</_short>110 <_short>Appearance</_short>
106111
=== modified file 'plugins/showdesktop/src/showdesktop.cpp'
--- plugins/showdesktop/src/showdesktop.cpp 2013-05-09 13:43:07 +0000
+++ plugins/showdesktop/src/showdesktop.cpp 2016-07-12 13:59:02 +0000
@@ -614,10 +614,21 @@
614 (state == SD_STATE_DEACTIVATING))614 (state == SD_STATE_DEACTIVATING))
615 {615 {
616 int steps;616 int steps;
617 float amount, chunk;617 float amount, chunk, speed, timestep;
618618
619 amount = msSinceLastPaint * 0.05f * optionGetSpeed ();619 if (optionGetSkipAnimation())
620 steps = amount / (0.5f * optionGetTimestep ());620 {
621 speed = USHRT_MAX;
622 timestep = 0.1;
623 }
624 else
625 {
626 speed = optionGetSpeed();
627 timestep = optionGetTimestep();
628 }
629
630 amount = msSinceLastPaint * 0.05f * speed;
631 steps = amount / (0.5f * timestep);
621 if (!steps)632 if (!steps)
622 steps = 1;633 steps = 1;
623 chunk = amount / (float)steps;634 chunk = amount / (float)steps;

Subscribers

People subscribed via source and target branches