summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2009-10-24 20:52:06 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2009-10-24 20:52:06 (GMT)
commit2e0a87dbffb1e729ecf5a7f523eecf75be28f8ef (patch)
tree89df034e6f2f326d6f0583aed93b690df7657768
parent9d6f717c60ba54bfeeb329910908430f59bc7813 (diff)
downloadtk-2e0a87dbffb1e729ecf5a7f523eecf75be28f8ef.zip
tk-2e0a87dbffb1e729ecf5a7f523eecf75be28f8ef.tar.gz
tk-2e0a87dbffb1e729ecf5a7f523eecf75be28f8ef.tar.bz2
Backport of fix for [Bug 2883712].
-rw-r--r--ChangeLog4
-rw-r--r--macosx/ttkMacOSXTheme.c42
2 files changed, 28 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e6b336..28a7e63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2009-10-24 Donal K. Fellows <dkf@users.sf.net>
+ * macosx/ttkMacOSXTheme.c (RangeToFactor, TrackElementDraw)
+ (PbarElementDraw): [Bug 2883712]: Corrected scaling of progress bars
+ and scales, and backported the fix for 64-bitness.
+
* library/button.tcl, unix/tkUnixButton.c (TkpDisplayButton):
[Patch 1530276]: Make -selectcolor handling work better for both
checkbuttons and radiobuttons when they don't have indicators.
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 4cdf80c..843dea7 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -27,7 +27,7 @@
* top-level window, not to the Tk_Window. BoxToRect()
* accounts for this.
*
- * RCS: @(#) $Id: ttkMacOSXTheme.c,v 1.21.2.2 2008/12/07 16:40:30 das Exp $
+ * RCS: @(#) $Id: ttkMacOSXTheme.c,v 1.21.2.3 2009/10/24 20:52:06 dkf Exp $
*/
#include "tkMacOSXPrivate.h"
@@ -56,6 +56,12 @@
SetGWorld(saveWorld,saveDevice); }
#endif /* defined(BUILD_TILE) */
+#ifdef __LP64__
+#define RangeToFactor(maximum) (((double) (INT_MAX >> 1)) / (maximum))
+#else
+#define RangeToFactor(maximum) (((double) (LONG_MAX >> 1)) / (maximum))
+#endif /* __LP64__ */
+
/*----------------------------------------------------------------------
* +++ Utilities.
*/
@@ -525,7 +531,7 @@ static void TrackElementDraw(
{
TrackElementData *data = clientData;
TrackElement *elem = elementRecord;
- double from = 0, to = 100, value = 0;
+ double from = 0, to = 100, value = 0, factor;
int orientation = TTK_ORIENT_HORIZONTAL;
ThemeTrackDrawInfo info;
@@ -533,15 +539,13 @@ static void TrackElementDraw(
Tcl_GetDoubleFromObj(NULL, elem->toObj, &to);
Tcl_GetDoubleFromObj(NULL, elem->valueObj, &value);
Ttk_GetOrientFromObj(NULL, elem->orientObj, &orientation);
+ factor = RangeToFactor(to - from);
- /* @@@ BUG: min, max, and value should account for resolution:
- * @@@ if finer than 1.0, conversion to int breaks.
- */
info.kind = data->kind;
info.bounds = BoxToRect(d, b);
- info.min = (int) from; /* @@@ */
- info.max = (int) to; /* @@@ */
- info.value = (int) value; /* @@@ */
+ info.min = (int) from * factor;
+ info.max = (int) to * factor;
+ info.value = (int) value * factor;
info.attributes = orientation == TTK_ORIENT_HORIZONTAL
? kThemeTrackHorizontal : 0;
@@ -549,14 +553,15 @@ static void TrackElementDraw(
info.enableState = Ttk_StateTableLookup(ThemeTrackEnableTable, state);
switch (data->kind) {
- case kThemeProgressBar:
- info.trackInfo.progress.phase = 0; /* 1-4: animation phase */
- break;
- case kThemeSlider:
- info.trackInfo.slider.pressState = 0; /* @@@ fill this in */
- info.trackInfo.slider.thumbDir = kThemeThumbPlain;
+ case kThemeProgressBar:
+ info.trackInfo.progress.phase = 0; /* 1-4: animation phase */
+ break;
+ case kThemeSlider:
+ info.trackInfo.slider.pressState = state & TTK_STATE_PRESSED ?
+ kThemeThumbPressed : 0;
+ info.trackInfo.slider.thumbDir = kThemeThumbPlain;
/* kThemeThumbUpward, kThemeThumbDownward, kThemeThumbPlain */
- break;
+ break;
}
BEGIN_DRAWING(d)
@@ -643,7 +648,7 @@ static void PbarElementDraw(
{
PbarElement *pbar = elementRecord;
int orientation = TTK_ORIENT_HORIZONTAL;
- double value = 0, maximum = 100;
+ double value = 0, maximum = 100, factor;
int phase = 0;
ThemeTrackDrawInfo info;
@@ -651,6 +656,7 @@ static void PbarElementDraw(
Tcl_GetDoubleFromObj(NULL, pbar->valueObj, &value);
Tcl_GetDoubleFromObj(NULL, pbar->maximumObj, &maximum);
Tcl_GetIntFromObj(NULL, pbar->phaseObj, &phase);
+ factor = RangeToFactor(maximum);
if (!strcmp("indeterminate", Tcl_GetString(pbar->modeObj)) && value) {
info.kind = kThemeIndeterminateBar;
@@ -659,8 +665,8 @@ static void PbarElementDraw(
}
info.bounds = BoxToRect(d, b);
info.min = 0;
- info.max = (int) maximum; /* @@@ See note above */
- info.value = (int) value;
+ info.max = (int) maximum * factor;
+ info.value = (int) value * factor;
info.attributes = orientation == TTK_ORIENT_HORIZONTAL
? kThemeTrackHorizontal : 0;
info.attributes |= kThemeTrackShowThumb;