Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 863104 - Fix Dock progress drawing on 10.6. r=josh

Browse Source
This commit is contained in:
Dave Vasilevsky 2013-04-17 02:51:52 -04:00
parent cc0744c9bf
commit 72c7993062
3 changed files with 14 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
widget/cocoa/nsMacDockSupport.h
View File

@ -3,14 +3,13 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#import <Carbon/Carbon.h>
#include "nsIMacDockSupport.h"
#include "nsIStandaloneNativeMenu.h"
#include "nsITaskbarProgress.h"
#include "nsITimer.h"
#include "nsCOMPtr.h"
#include "nsString.h"
#include "nsNativeThemeCocoa.h"
class nsMacDockSupport : public nsIMacDockSupport, public nsITaskbarProgress
{
@ -27,11 +26,12 @@ protected:
nsString mBadgeText;
NSImage *mAppIcon, *mProgressBackground;
HIThemeTrackDrawInfo mProgressDrawInfo;
HIRect mProgressBounds;
nsTaskbarProgressState mProgressState;
double mProgressFraction;
nsCOMPtr<nsITimer> mProgressTimer;
nsRefPtr<nsNativeThemeCocoa> mTheme;
static void RedrawIconCallback(nsITimer* aTimer, void* aClosure);

41
widget/cocoa/nsMacDockSupport.mm
View File

@ -3,7 +3,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#import <Carbon/Carbon.h>
#import <Cocoa/Cocoa.h>
#include "nsComponentManagerUtils.h"
@ -139,32 +138,14 @@ bool nsMacDockSupport::InitProgress()
mProgressTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
mAppIcon = [[NSImage imageNamed:@"NSApplicationIcon"] retain];
mProgressBackground = [mAppIcon copyWithZone:nil];
mTheme = new nsNativeThemeCocoa();
NSSize sz = [mProgressBackground size];
mProgressDrawInfo.version = 0;
mProgressDrawInfo.min = 0;
mProgressDrawInfo.value = 0;
mProgressDrawInfo.max = PR_INT32_MAX;
mProgressDrawInfo.bounds = CGRectMake(sz.width * 1/32, sz.height * 3/32,
sz.width * 30/32, sz.height * 2/32);
mProgressDrawInfo.attributes = kThemeTrackHorizontal;
mProgressDrawInfo.enableState = kThemeTrackActive;
mProgressDrawInfo.kind = kThemeLargeProgressBar;
mProgressDrawInfo.trackInfo.progress.phase = 0;
// Draw a light background, to visually distinguish the progress.
HIRect bounds;
HIThemeGetTrackBounds(&mProgressDrawInfo, &bounds);
// Margins within track, empirically. FIXME: Don't hardcode?
int mleft = 3, mtop = 3, mright = 3, mbot = 1;
bounds.origin.x += mleft;
bounds.origin.y += mbot;
bounds.size.width -= mleft + mright;
bounds.size.height -= mtop + mbot;
mProgressBounds = CGRectMake(sz.width * 1/32, sz.height * 3/32,
sz.width * 30/32, sz.height * 4/32);
[mProgressBackground lockFocus];
[[NSColor whiteColor] set];
NSRectFill(NSRectFromCGRect(bounds));
NSRectFill(NSRectFromCGRect(mProgressBounds));
[mProgressBackground unlockFocus];
}
return true;
@ -176,22 +157,14 @@ nsMacDockSupport::RedrawIcon()
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
if (InitProgress()) {
// TODO: - Share code with nsNativeThemeCocoa?
// - Implement ERROR and PAUSED states?
// TODO: - Implement ERROR and PAUSED states?
NSImage *icon = [mProgressBackground copyWithZone:nil];
bool isIndeterminate = (mProgressState != STATE_NORMAL);
mProgressDrawInfo.value = PR_INT32_MAX * mProgressFraction;
mProgressDrawInfo.kind = isIndeterminate ? kThemeLargeIndeterminateBar
: kThemeLargeProgressBar;
int stepsPerSecond = isIndeterminate ? 60 : 30;
mProgressDrawInfo.trackInfo.progress.phase =
uint8_t(PR_IntervalToMilliseconds(PR_IntervalNow()) * stepsPerSecond / 1000);
[icon lockFocus];
CGContextRef ctx = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
HIThemeDrawTrack(&mProgressDrawInfo, NULL, ctx, kHIThemeOrientationNormal);
mTheme->DrawProgress(ctx, mProgressBounds, isIndeterminate,
true, mProgressFraction, 1.0, NULL);
[icon unlockFocus];
[NSApp setApplicationIconImage:icon];
[icon release];

7
widget/cocoa/nsNativeThemeCocoa.h
View File

@ -61,6 +61,10 @@ public:
bool ThemeNeedsComboboxDropmarker();
virtual Transparency GetWidgetTransparency(nsIFrame* aFrame, uint8_t aWidgetType);
void DrawProgress(CGContextRef context, const HIRect& inBoxRect,
bool inIsIndeterminate, bool inIsHorizontal,
double inValue, double inMaxValue, nsIFrame* aFrame);
protected:
nsIntMargin RTLAwareMargin(const nsIntMargin& aMargin, nsIFrame* aFrame);
@ -72,9 +76,6 @@ protected:
void DrawFrame(CGContextRef context, HIThemeFrameKind inKind,
const HIRect& inBoxRect, bool inReadOnly,
nsEventStates inState);
void DrawProgress(CGContextRef context, const HIRect& inBoxRect,
bool inIsIndeterminate, bool inIsHorizontal,
double inValue, double inMaxValue, nsIFrame* aFrame);
void DrawMeter(CGContextRef context, const HIRect& inBoxRect,
nsIFrame* aFrame);
void DrawSegment(CGContextRef cgContext, const HIRect& inBoxRect,