Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch bug-8bee4b2009 Excluding Merge-Ins
This is equivalent to a diff from bf9a2216 to fba99d26
2023-01-02
| ||
16:27 | Merge 8.6 check-in: befeafbf user: jan.nijtmans tags: trunk, main | |
2022-12-30
| ||
16:44 | A workaround for [8bee4b2009]: the default font used for progressbars is of very small size. Test progressbar-3.3 now passes. Closed-Leaf check-in: fba99d26 user: fvogel tags: bug-8bee4b2009 | |
16:41 | Add (currently failing) test progressbar-3.3 demonstrating bug [8bee4b2009]. check-in: 79c6edba user: fvogel tags: bug-8bee4b2009 | |
2022-12-29
| ||
22:56 | Use some more point-expressions in stead of tk::ScaleNum check-in: bf9a2216 user: jan.nijtmans tags: trunk, main | |
2022-12-22
| ||
20:10 | For completeness, added the automatic scaling to the winnative theme, too check-in: a1523223 user: csaba tags: trunk, main | |
Changes to doc/ttk_progressbar.n.
︙ | |||
20 21 22 23 24 25 26 | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | - + + | \fIindeterminate\fR mode provides an animated display to let the user know that something is happening. .PP If the value of \fB-orient\fR is \fBhorizontal\fR a text string can be displayed inside the progressbar. This string can be configured using the \fB-anchor\fR, \fB-font\fR, \fB-foreground\fR, \fB-justify\fR, \fB-text\fR and \fB-wraplength\fR options. If the value of \fB-orient\fR |
︙ |
Changes to generic/ttk/ttkProgress.c.
︙ | |||
50 51 52 53 54 55 56 | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | - + | static const Tk_OptionSpec ProgressbarOptionSpecs[] = { {TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor", "w", offsetof(Progressbar,progress.anchorObj), TCL_INDEX_NONE, TK_OPTION_NULL_OK, 0, GEOMETRY_CHANGED}, {TK_OPTION_FONT, "-font", "font", "Font", |
︙ |
Changes to library/ttk/progress.tcl.
1 2 3 4 5 6 7 8 9 10 11 12 13 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | + + + + + + + + + + + | # # Ttk widget set: progress bar utilities. # namespace eval ttk::progressbar { variable Timers ;# Map: widget name -> after ID # Default font for -text option in progressbars: # The size of a progressbar takes the font height into account so that when # some -text is to be displayed it does not get cropped. The default font # size must be very small in order to not increase the progresbar height # to the font height when no text is displayed (which is the default). # When some -text must be displayed then the user has to set an adequate # font size. For more details, see ticket [8bee4b2009]. font create TkDefaultFont_progressbar {*}[font actual TkDefaultFont] font configure TkDefaultFont_progressbar -size -1 } # Autoincrement -- # Periodic callback procedure for autoincrement mode # proc ttk::progressbar::Autoincrement {pb steptime stepsize} { variable Timers |
︙ |
Added tests/ttk/pb_image.svg.
|
Changes to tests/ttk/progressbar.test.
︙ | |||
117 118 119 120 121 122 123 124 125 126 127 128 129 130 | 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 | + + + + + + + + + + + + + + + + | lappend res [list $option [.p cget $option]] } set res } -cleanup { unset res thefont destroy .p } -result {{-anchor e} {-foreground green} {-justify center} {-text {Cannot be seen}} {-wraplength 250}} test progressbar-3.3 {horizontal progressbar height with no -text (TIP #442) specified - Bug [8bee4b2009]} -setup { set oldTheme [ttk::style theme use] } -body { ttk::style theme use default set imga [image create photo -file [file join [file dirname [info script]] pb_image.svg] -format {svg -scale 0.8}] ::ttk::style element create Horizontal.Progressbar.pbar image $imga pack [ttk::progressbar .p -orient horizontal] .p step 25 update expr {[winfo reqheight .p] == [image height $imga] + 2} } -cleanup { destroy .p ttk::style theme use $oldTheme # there's no way I know to undo '::ttk::style element create...' } -result {1} test progressbar-4.1 "style command" -body { ttk::progressbar .wh ; # default is -orient horizontal ttk::progressbar .wv -orient vertical list [.wh cget -style] [.wh style] [winfo class .wh]\ [.wv cget -style] [.wv style] [winfo class .wv] } -cleanup { |
︙ |