From e62a1c4bd7e6073de5aef7a262d838b0df46d504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 21 Dec 2018 11:23:01 +0100 Subject: New upstream version 0.7.2 --- src/renderers/pieRenderer.vala | 49 +++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 22 deletions(-) (limited to 'src/renderers/pieRenderer.vala') diff --git a/src/renderers/pieRenderer.vala b/src/renderers/pieRenderer.vala index 47d8b8e..2f8aaf4 100644 --- a/src/renderers/pieRenderer.vala +++ b/src/renderers/pieRenderer.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// using GLib.Math; @@ -428,19 +434,20 @@ public class PieRenderer : GLib.Object { /// Activates the currently active slice. ///////////////////////////////////////////////////////////////////// - public void activate(uint32 time_stamp) { + public void activate(uint32 time_stamp, bool fade_out) { if (this.active_slice >= this.first_slice_idx && this.active_slice < this.first_slice_idx+this.visible_slice_count) { slices[active_slice].activate(time_stamp); } - //foreach (var slice in this.slices) - // slice.fade_out(); - for (int i= 0; i < this.visible_slice_count; ++i) { - this.slices[ i+this.first_slice_idx ].fade_out(); - } + if (fade_out) + { + for (int i= 0; i < this.visible_slice_count; ++i) { + this.slices[ i+this.first_slice_idx ].fade_out(); + } - center.fade_out(); + center.fade_out(); + } } ///////////////////////////////////////////////////////////////////// @@ -448,8 +455,6 @@ public class PieRenderer : GLib.Object { ///////////////////////////////////////////////////////////////////// public void cancel() { - //foreach (var slice in this.slices) - // slice.fade_out(); for (int i= 0; i < this.visible_slice_count; ++i) { this.slices[ i+this.first_slice_idx ].fade_out(); } -- cgit v1.2.3