summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2008-02-23 17:35:27 (GMT)
committerjenglish <jenglish@flightlab.com>2008-02-23 17:35:27 (GMT)
commit0c1706a93153b2af96989598d81c96c8ad692fb9 (patch)
tree430302e4141f7b2b894b2bf9d9d9a4cd71c48083
parent074cfc1ee76cbf657b93529afe7949fa231440c8 (diff)
downloadtk-0c1706a93153b2af96989598d81c96c8ad692fb9.zip
tk-0c1706a93153b2af96989598d81c96c8ad692fb9.tar.gz
tk-0c1706a93153b2af96989598d81c96c8ad692fb9.tar.bz2
Don't enforce minimum sash thickness of 5 pixels, just use 5 as a default
[FR 1898288]
-rw-r--r--ChangeLog5
-rw-r--r--generic/ttk/ttkPanedwindow.c13
2 files changed, 9 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 166cc61..24dd3d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-23 Joe English <jenglish@users.sourceforge.net>
+
+ * generic/ttk/ttkPanedWindow.c: Don't enforce minimum sash
+ thickness of 5 pixels, just use 5 as a default [FR 1898288]
+
2008-02-14 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* unix/README: Documented missing configure flags.
diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c
index 8c0244c..cac3d20 100644
--- a/generic/ttk/ttkPanedwindow.c
+++ b/generic/ttk/ttkPanedwindow.c
@@ -1,4 +1,4 @@
-/* $Id: ttkPanedwindow.c,v 1.13 2007/12/13 15:26:26 dgp Exp $
+/* $Id: ttkPanedwindow.c,v 1.14 2008/02/23 17:35:28 jenglish Exp $
*
* Copyright (c) 2005, Joe English. Freely redistributable.
*
@@ -13,8 +13,6 @@
#include "ttkTheme.h"
#include "ttkWidget.h"
-#define MIN_SASH_THICKNESS 5
-
/*------------------------------------------------------------------------
* +++ Layout algorithm.
*
@@ -570,11 +568,6 @@ static Ttk_Layout PanedGetLayout(
}
}
- /* Sanity-check:
- */
- if (pw->paned.sashThickness < MIN_SASH_THICKNESS)
- pw->paned.sashThickness = MIN_SASH_THICKNESS;
-
return panedLayout;
}
@@ -899,6 +892,8 @@ static WidgetSpec PanedWidgetSpec =
* +++ Elements and layouts.
*/
+static const int DEFAULT_SASH_THICKNESS = 5;
+
typedef struct {
Tcl_Obj *thicknessObj;
} SashElement;
@@ -914,7 +909,7 @@ static void SashElementSize(
int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
{
SashElement *sash = elementRecord;
- int thickness = MIN_SASH_THICKNESS;
+ int thickness = DEFAULT_SASH_THICKNESS;
Tcl_GetIntFromObj(NULL, sash->thicknessObj, &thickness);
*widthPtr = *heightPtr = thickness;
}