summaryrefslogtreecommitdiffstats
path: root/generic/ttk
diff options
context:
space:
mode:
authorcsaba <csaba>2024-04-25 17:12:22 (GMT)
committercsaba <csaba>2024-04-25 17:12:22 (GMT)
commit79e9d9d65ce9842ced969a0d14e012e86e1142fd (patch)
treee037bfc21961e3afbfae688ddf255c2bef88a60a /generic/ttk
parentd34ec53094330262b19a1cc0372e0753324e1ab7 (diff)
downloadtk-79e9d9d65ce9842ced969a0d14e012e86e1142fd.zip
tk-79e9d9d65ce9842ced969a0d14e012e86e1142fd.tar.gz
tk-79e9d9d65ce9842ced969a0d14e012e86e1142fd.tar.bz2
Minor cosmetic improvements in ttkDefaultTheme.c.
Diffstat (limited to 'generic/ttk')
-rw-r--r--generic/ttk/ttkDefaultTheme.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/generic/ttk/ttkDefaultTheme.c b/generic/ttk/ttkDefaultTheme.c
index c774d43..b07d4d3 100644
--- a/generic/ttk/ttkDefaultTheme.c
+++ b/generic/ttk/ttkDefaultTheme.c
@@ -253,7 +253,7 @@ static const Ttk_ElementOptionSpec BorderElementOptions[] = {
STRINGIFY(BORDERWIDTH) },
{ "-relief", TK_OPTION_RELIEF, offsetof(BorderElement,reliefObj),
"flat" },
- { NULL, TK_OPTION_BOOLEAN, 0, NULL }
+ { NULL, TK_OPTION_BOOLEAN, 0, NULL }
};
static void BorderElementSize(
@@ -1135,12 +1135,12 @@ static const Ttk_ElementOptionSpec SliderElementOptions[] = {
"15" },
{ "-sliderrelief", TK_OPTION_RELIEF, offsetof(SliderElement,reliefObj),
"raised" },
- { "-borderwidth", TK_OPTION_PIXELS, offsetof(SliderElement,borderWidthObj),
- STRINGIFY(BORDERWIDTH) },
{ "-background", TK_OPTION_BORDER, offsetof(SliderElement,borderObj),
DEFAULT_BACKGROUND },
{ "-bordercolor", TK_OPTION_COLOR, offsetof(SliderElement,borderColorObj),
"black" },
+ { "-borderwidth", TK_OPTION_PIXELS, offsetof(SliderElement,borderWidthObj),
+ STRINGIFY(BORDERWIDTH) },
{ "-orient", TK_OPTION_ANY, offsetof(SliderElement,orientObj),
"horizontal" },
{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
@@ -1159,8 +1159,8 @@ static void SliderElementSize(
int thickness, borderWidth;
Ttk_GetOrientFromObj(NULL, slider->orientObj, &orient);
- Tk_GetPixelsFromObj(NULL, tkwin, slider->borderWidthObj, &borderWidth);
Tk_GetPixelsFromObj(NULL, tkwin, slider->thicknessObj, &thickness);
+ Tk_GetPixelsFromObj(NULL, tkwin, slider->borderWidthObj, &borderWidth);
switch (orient) {
case TTK_ORIENT_VERTICAL:
@@ -1236,13 +1236,13 @@ static void TreeitemIndicatorSize(
TCL_UNUSED(Ttk_Padding *))
{
TreeitemIndicator *indicator = (TreeitemIndicator *)elementRecord;
- int diameter = 0;
+ int size = 0;
Ttk_Padding margins;
+ Tk_GetPixelsFromObj(NULL, tkwin, indicator->sizeObj, &size);
Ttk_GetPaddingFromObj(NULL, tkwin, indicator->marginObj, &margins);
- Tk_GetPixelsFromObj(NULL, tkwin, indicator->sizeObj, &diameter);
- *widthPtr = diameter + Ttk_PaddingWidth(margins);
- *heightPtr = diameter + Ttk_PaddingHeight(margins);
+ *widthPtr = size + Ttk_PaddingWidth(margins);
+ *heightPtr = size + Ttk_PaddingHeight(margins);
}
static void TreeitemIndicatorDraw(