Commit a9399ea
committed
Fix NavigationView focus routing on mouse click and ScrollablePanel last-line clipping
Replace _navPaneHasFocus boolean with computed NavPaneHasFocus property
derived from _navScrollPanel.HasFocus (single source of truth). Previously,
mouse clicks bypassed the HasFocus setter and never updated _navPaneHasFocus,
causing arrow keys to scroll the panel instead of moving selection.
Expose FocusedContent on HorizontalGridControl. Refactor FocusNavPane and
FocusContentPanel to toggle HasFocus directly on both panels.
Fix ScrollablePanel CalculateContentHeight width mismatch: measure at full
width first, re-measure at viewport-2 only when content overflows (matching
the paint loop's 2-column scrollbar reservation). The previous -1 subtraction
caused phantom scrollbars and last-line clipping.1 parent 9b6216d commit a9399ea
3 files changed
Lines changed: 36 additions & 17 deletions
File tree
- SharpConsoleUI/Controls
- HorizontalGridControl
- ScrollablePanelControl
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
76 | 76 | | |
77 | 77 | | |
78 | 78 | | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
79 | 84 | | |
80 | 85 | | |
81 | 86 | | |
| |||
Lines changed: 16 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
57 | 61 | | |
58 | 62 | | |
59 | 63 | | |
| |||
72 | 76 | | |
73 | 77 | | |
74 | 78 | | |
75 | | - | |
76 | 79 | | |
77 | 80 | | |
78 | 81 | | |
| |||
120 | 123 | | |
121 | 124 | | |
122 | 125 | | |
123 | | - | |
| 126 | + | |
124 | 127 | | |
125 | 128 | | |
126 | 129 | | |
| |||
136 | 139 | | |
137 | 140 | | |
138 | 141 | | |
139 | | - | |
| 142 | + | |
140 | 143 | | |
141 | | - | |
142 | | - | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
143 | 149 | | |
144 | 150 | | |
145 | 151 | | |
| |||
399 | 405 | | |
400 | 406 | | |
401 | 407 | | |
402 | | - | |
403 | | - | |
| 408 | + | |
404 | 409 | | |
405 | 410 | | |
406 | | - | |
| 411 | + | |
407 | 412 | | |
408 | 413 | | |
409 | 414 | | |
410 | 415 | | |
411 | 416 | | |
412 | | - | |
413 | | - | |
| 417 | + | |
| 418 | + | |
414 | 419 | | |
415 | 420 | | |
416 | 421 | | |
| |||
Lines changed: 15 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
477 | 477 | | |
478 | 478 | | |
479 | 479 | | |
480 | | - | |
481 | | - | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
482 | 483 | | |
483 | | - | |
484 | | - | |
485 | | - | |
| 484 | + | |
| 485 | + | |
486 | 486 | | |
487 | | - | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
488 | 490 | | |
489 | 491 | | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
| 495 | + | |
| 496 | + | |
| 497 | + | |
| 498 | + | |
490 | 499 | | |
491 | 500 | | |
492 | 501 | | |
| |||
0 commit comments