Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch rfe-d5480d1da2 Excluding Merge-Ins
This is equivalent to a diff from 6d0524a1f8 to 26b1b9804b
2017-05-08
| ||
18:21 | MessageDlg.html: Documented the use of the native widget for "MessageDlg -type !user" and the limited set of recognized options. Ticket [8edade3cea] by Gerhard Reithofer check-in: 66e9c7802d user: oehhar tags: bwidget | |
2017-01-16
| ||
08:45 | Rename option '-onlyhover' to 'autohidescrollbars' Leaf check-in: 26b1b9804b user: oehhar tags: rfe-d5480d1da2 | |
2017-01-14
| ||
13:22 | Revert demo test modification check-in: cad07b0345 user: oehhar tags: rfe-d5480d1da2 | |
2017-01-12
| ||
14:39 | Display ScrolledWindow scrollbars only if mouse is in the widget. Tciket [d5480d1da2] by Alexandru check-in: 246eaca515 user: oehhar tags: rfe-d5480d1da2 | |
2016-11-02
| ||
23:56 | scrollframe.tcl: Eric advised to check for unmapped window, as the <Map> event may be executed in the unmapped state. check-in: 6d0524a1f8 user: oehhar tags: bwidget | |
2016-10-31
| ||
17:53 | Remove the whole <Unmap> binding, as it does not do any thing any more check-in: cb6716528c user: oehhar tags: bwidget | |
Changes to scrollframe.tcl.
︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | + + + + + | # - ScrollableFrame::see # - ScrollableFrame::xview # - ScrollableFrame::yview # - ScrollableFrame::_resize # ---------------------------------------------------------------------------- namespace eval ScrollableFrame { # track scrollbar on hoover array set mouseover {} Widget::define ScrollableFrame scrollframe # If themed, there is no background and -bg option if {[Widget::theme]} { Widget::declare ScrollableFrame { {-width Int 0 0 {}} {-height Int 0 0 {}} {-areawidth Int 0 0 {}} {-areaheight Int 0 0 {}} {-constrainedwidth Boolean 0 0} {-constrainedheight Boolean 0 0} {-autohidescrollbar Boolean 0 0} {-xscrollcommand TkResource "" 0 canvas} {-yscrollcommand TkResource "" 0 canvas} {-xscrollincrement TkResource "" 0 canvas} {-yscrollincrement TkResource "" 0 canvas} } } else { Widget::declare ScrollableFrame { {-background TkResource "" 0 frame} {-width Int 0 0 {}} {-height Int 0 0 {}} {-areawidth Int 0 0 {}} {-areaheight Int 0 0 {}} {-constrainedwidth Boolean 0 0} {-constrainedheight Boolean 0 0} {-autohidescrollbar Boolean 0 0} {-xscrollcommand TkResource "" 0 canvas} {-yscrollcommand TkResource "" 0 canvas} {-xscrollincrement TkResource "" 0 canvas} {-yscrollincrement TkResource "" 0 canvas} {-bg Synonym -background} } } |
︙ | |||
64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | + + + + + + + + | } # ---------------------------------------------------------------------------- # Command ScrollableFrame::create # ---------------------------------------------------------------------------- proc ScrollableFrame::create { path args } { variable mouseover Widget::init ScrollableFrame $path $args # Actually $canvas is the same as $path set canvas [eval [list canvas $path] [Widget::subcget $path :cmd] \ -highlightthickness 0 -borderwidth 0 -relief flat] # Initialization: mouse is within frame set mouseover($canvas) 1 set autohidescrollbar [Widget::cget $path -autohidescrollbar] if {[Widget::theme]} { set frame [eval [list ttk::frame $path.frame] \ [Widget::subcget $path .frame]] set bg [ttk::style lookup TFrame -background] } else { set frame [eval [list frame $path.frame] \ [Widget::subcget $path .frame] \ |
︙ | |||
93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | 106 107 108 109 110 111 112 113 114 115 116 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 147 148 149 150 151 152 153 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + | bind $frame <Configure> \ [list ScrollableFrame::_frameConfigure $canvas] # add <unmap> binding: <configure> is not called when frame # becomes so small that it suddenly falls outside of currently visible area. # but now we need to add a <map> binding too bind $frame <Map> \ [list ScrollableFrame::_frameConfigure $canvas] bind $frame <Unmap> \ [list ScrollableFrame::_frameConfigure $canvas 1] bindtags $path [list $path BwScrollableFrame [winfo toplevel $path] all] if {$autohidescrollbar} { # Show scrollbar if mouse within frame bind [winfo parent $path] <Enter> [list ScrollableFrame::enter $canvas] # Hide scrollbar if mouse leaves frame bind [winfo parent $path] <Leave> [list ScrollableFrame::leave $canvas] } return [Widget::create ScrollableFrame $path] } # ---------------------------------------------------------------------------- # Command ScrollableFrame::enter # ---------------------------------------------------------------------------- # Show scrollbars as mouse entered frame proc ScrollableFrame::enter {canvas} { variable mouseover set mouseover($canvas) 1 ScrollableFrame::_frameConfigure $canvas } # ---------------------------------------------------------------------------- # Command ScrollableFrame::leave # ---------------------------------------------------------------------------- # Hide scrollbars as mouse left frame proc ScrollableFrame::leave {canvas} { variable mouseover set mouseover($canvas) 0 ScrollableFrame::_frameConfigure $canvas 1 } # ---------------------------------------------------------------------------- # Command ScrollableFrame::configure # ---------------------------------------------------------------------------- proc ScrollableFrame::configure { path args } { set res [Widget::configure $path $args] set upd 0 |
︙ | |||
240 241 242 243 244 245 246 | 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 | - + + + + + + + + + + + + + + - - - + + + + + + + | } # ---------------------------------------------------------------------------- # Command ScrollableFrame::_frameConfigure # ---------------------------------------------------------------------------- proc ScrollableFrame::_max {a b} {return [expr {$a <= $b ? $b : $a}]} |
Changes to scrollw.tcl.
︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | + + + - + + + + + + + | # - ScrolledWindow::_set_vscroll # - ScrolledWindow::_setData # - ScrolledWindow::_setSBSize # - ScrolledWindow::_realize # ----------------------------------------------------------------------------- namespace eval ScrolledWindow { # hide scrollbars if mouse not within frame array set mouseover {} Widget::define ScrolledWindow scrollw Widget::declare ScrolledWindow { {-background TkResource "" 0 button} {-scrollbar Enum both 0 {none both vertical horizontal}} {-auto Enum both 0 {none both vertical horizontal}} {-sides Enum se 0 {ne en nw wn se es sw ws}} {-size Int 0 1 "%d >= 0"} {-ipad Int 1 1 "%d >= 0"} |
︙ | |||
94 95 96 97 98 99 100 | 103 104 105 106 107 108 109 110 111 112 113 114 115 116 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 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 | - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | $path.hscroll configure -width $sbsize } else { set sbsize [$path.vscroll cget -width] } } set data(ipad) [Widget::cget $path -ipad] |
︙ | |||
148 149 150 151 152 153 154 155 156 157 158 159 160 161 | 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 | + + + | } # ----------------------------------------------------------------------------- # Command ScrolledWindow::configure # ----------------------------------------------------------------------------- proc ScrolledWindow::configure { path args } { variable mouseover set mouseover($path) 0 Widget::getVariable $path data set res [Widget::configure $path $args] if { ! $::Widget::_theme && [Widget::hasChanged $path -background bg] } { $path configure -background $bg catch {$path.hscroll configure -background $bg} catch {$path.vscroll configure -background $bg} |
︙ | |||
170 171 172 173 174 175 176 | 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 | - + - + | (!$data(hsb,auto) || ($vmin != 0 || $vmax != 1))}] foreach {vmin vmax} [$path.vscroll get] { break } set data(vsb,packed) [expr {$data(vsb,present) && \ (!$data(vsb,auto) || ($vmin != 0 || $vmax != 1))}] set data(ipad) [Widget::cget $path -ipad] |
︙ | |||
205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 | 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 | + - + + + - + | } # ----------------------------------------------------------------------------- # Command ScrolledWindow::_set_hscroll # ----------------------------------------------------------------------------- proc ScrolledWindow::_set_hscroll { path vmin vmax } { variable mouseover Widget::getVariable $path data if {$data(realized) && $data(hsb,present)} { if {$data(hsb,auto) && ![info exists data(hlock)]} { if {$data(hsb,packed) && $vmin == 0 && $vmax == 1} { set data(hsb,packed) 0 grid remove $path.hscroll set data(hlock) 1 update idletasks unset data(hlock) |
︙ |