Skip to content

Commit 4561340

Browse files
author
csaba
committed
scaleutil.tcl: Changes related to ttk::notebook in Windows themes, due to limitations of the scaling support in the Visual Styles API.
1 parent 61ba7a9 commit 4561340

File tree

2 files changed

+0
-32
lines changed

2 files changed

+0
-32
lines changed

modules/scrollutil/scripts/utils/scaleutil.tcl

-16
Original file line numberDiff line numberDiff line change
@@ -670,12 +670,6 @@ proc scaleutil::scaleStyles_vista pct {
670670
ttk::style configure $style -padding [scale 2 $pct]
671671
}
672672

673-
set m [scale 2 $pct]
674-
set margins [list $m $m $m 0] ;# {2 2 2 0}
675-
ttk::style configure TNotebook -tabmargins $margins
676-
set margins [list $m $m $m $m] ;# {2 2 2 2}
677-
ttk::style map TNotebook.Tab -expand [list selected $margins]
678-
679673
set padding [list [scale 4 $pct] 0 0 0] ;# {4 0 0 0}
680674
ttk::style configure Item -padding $padding
681675
ttk::style configure Treeview -indent [scale 20 $pct]
@@ -711,12 +705,8 @@ proc scaleutil::scaleStyles_winnative pct {
711705
ttk::style configure $style -padding $padding
712706
}
713707

714-
set m [scale 2 $pct]
715-
set margins [list $m $m $m 0] ;# {2 2 2 0}
716-
ttk::style configure TNotebook -tabmargins $margins
717708
ttk::style configure TNotebook.Tab \
718709
-padding [list [scale 3 $pct] [scale 1 $pct]]
719-
ttk::style map TNotebook.Tab -expand [list selected $margins]
720710

721711
set l [scale 2 $pct]; set t $l; set r [scale 4 $pct]; set b $l
722712
set indMargins [list $l $t $r $b] ;# {2 2 4 2}
@@ -748,12 +738,6 @@ proc scaleutil::scaleStyles_xpnative pct {
748738
ttk::style configure $style -padding [scale 2 $pct]
749739
}
750740

751-
set m [scale 2 $pct]
752-
set margins [list $m $m $m 0] ;# {2 2 2 0}
753-
ttk::style configure TNotebook -tabmargins $margins
754-
set margins [list $m $m $m $m] ;# {2 2 2 2}
755-
ttk::style map TNotebook.Tab -expand [list selected $margins]
756-
757741
set l [scale 2 $pct]; set t $l; set r [scale 4 $pct]; set b $l
758742
set indMargins [list $l $t $r $b] ;# {2 2 4 2}
759743
ttk::style configure Item -diameter [scale 9 $pct] \

modules/tablelist/scripts/utils/scaleutil.tcl

-16
Original file line numberDiff line numberDiff line change
@@ -670,12 +670,6 @@ proc scaleutil::scaleStyles_vista pct {
670670
ttk::style configure $style -padding [scale 2 $pct]
671671
}
672672

673-
set m [scale 2 $pct]
674-
set margins [list $m $m $m 0] ;# {2 2 2 0}
675-
ttk::style configure TNotebook -tabmargins $margins
676-
set margins [list $m $m $m $m] ;# {2 2 2 2}
677-
ttk::style map TNotebook.Tab -expand [list selected $margins]
678-
679673
set padding [list [scale 4 $pct] 0 0 0] ;# {4 0 0 0}
680674
ttk::style configure Item -padding $padding
681675
ttk::style configure Treeview -indent [scale 20 $pct]
@@ -711,12 +705,8 @@ proc scaleutil::scaleStyles_winnative pct {
711705
ttk::style configure $style -padding $padding
712706
}
713707

714-
set m [scale 2 $pct]
715-
set margins [list $m $m $m 0] ;# {2 2 2 0}
716-
ttk::style configure TNotebook -tabmargins $margins
717708
ttk::style configure TNotebook.Tab \
718709
-padding [list [scale 3 $pct] [scale 1 $pct]]
719-
ttk::style map TNotebook.Tab -expand [list selected $margins]
720710

721711
set l [scale 2 $pct]; set t $l; set r [scale 4 $pct]; set b $l
722712
set indMargins [list $l $t $r $b] ;# {2 2 4 2}
@@ -748,12 +738,6 @@ proc scaleutil::scaleStyles_xpnative pct {
748738
ttk::style configure $style -padding [scale 2 $pct]
749739
}
750740

751-
set m [scale 2 $pct]
752-
set margins [list $m $m $m 0] ;# {2 2 2 0}
753-
ttk::style configure TNotebook -tabmargins $margins
754-
set margins [list $m $m $m $m] ;# {2 2 2 2}
755-
ttk::style map TNotebook.Tab -expand [list selected $margins]
756-
757741
set l [scale 2 $pct]; set t $l; set r [scale 4 $pct]; set b $l
758742
set indMargins [list $l $t $r $b] ;# {2 2 4 2}
759743
ttk::style configure Item -diameter [scale 9 $pct] \

0 commit comments

Comments
 (0)