Author: mlytwyn
Date: Mon Aug 4 23:53:24 2014
New Revision: 38035
URL: http://svn.gna.org/viewcvs/gnustep?rev=38035&view=rev
Log:
Ignore start animation if progress indicator view is set to hidden
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSProgressIndicator.m
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSProgressIndicator.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSProgressIndicator.m?rev=38035&r1=38034&r2=38035&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSProgressIndicator.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSProgressIndicator.m
Mon Aug 4 23:53:24 2014
@@ -128,6 +128,9 @@
&& (_style == NSProgressIndicatorBarStyle)))
return;
+ if ([self isHidden] && (_isDisplayedWhenStopped == YES))
+ return;
+
_isRunning = YES;
if (!_usesThreadedAnimation)
{
@@ -162,9 +165,12 @@
// Done automatically
}
+#if 0
if (_isDisplayedWhenStopped == NO)
[self setHidden:YES];
+#endif
_isRunning = NO;
+ [self setNeedsDisplay: YES];
}
- (BOOL) usesThreadedAnimation
@@ -337,8 +343,15 @@
{
double val;
- if (!_isRunning && !_isDisplayedWhenStopped)
+ if (!_isRunning)
+ {
+ if (_isDisplayedWhenStopped == NO)
+ {
+ [[NSColor clearColor] setFill];
+ NSRectFill(_bounds);
+ }
return;
+ }
if (_doubleValue < _minValue)
val = 0.0;
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
