Fossil SCM
Improved top-panel button layout on Window for the "fossil merge-into --tk" app.
Commit
f27e2b0e61c121faab4cc07c59cf9a249f42620eff71474488e0db4fc844a392
Parent
0743cfc2e71c80a…
2 files changed
+1
-1
+5
-5
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -163,11 +163,11 @@ | ||
| 163 | 163 | return; |
| 164 | 164 | } |
| 165 | 165 | mergebuilder_init_tcl(&mb); |
| 166 | 166 | mb.nContext = nContext; |
| 167 | 167 | |
| 168 | - /* Set up the pivot */ | |
| 168 | + /* Set up the pivot or baseline */ | |
| 169 | 169 | zFN = db_column_text(&q, 0); |
| 170 | 170 | if( zFN==0 ){ |
| 171 | 171 | /* No pivot because the file was added */ |
| 172 | 172 | mb.zPivot = "(no baseline)"; |
| 173 | 173 | blob_zero(&pivot); |
| 174 | 174 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -163,11 +163,11 @@ | |
| 163 | return; |
| 164 | } |
| 165 | mergebuilder_init_tcl(&mb); |
| 166 | mb.nContext = nContext; |
| 167 | |
| 168 | /* Set up the pivot */ |
| 169 | zFN = db_column_text(&q, 0); |
| 170 | if( zFN==0 ){ |
| 171 | /* No pivot because the file was added */ |
| 172 | mb.zPivot = "(no baseline)"; |
| 173 | blob_zero(&pivot); |
| 174 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -163,11 +163,11 @@ | |
| 163 | return; |
| 164 | } |
| 165 | mergebuilder_init_tcl(&mb); |
| 166 | mb.nContext = nContext; |
| 167 | |
| 168 | /* Set up the pivot or baseline */ |
| 169 | zFN = db_column_text(&q, 0); |
| 170 | if( zFN==0 ){ |
| 171 | /* No pivot because the file was added */ |
| 172 | mb.zPivot = "(no baseline)"; |
| 173 | blob_zero(&pivot); |
| 174 |
+5
-5
| --- src/merge.tcl | ||
| +++ src/merge.tcl | ||
| @@ -610,17 +610,17 @@ | ||
| 610 | 610 | } |
| 611 | 611 | set ::search $w |
| 612 | 612 | } |
| 613 | 613 | ::ttk::button .bb.quit -text {Quit} -command exit |
| 614 | 614 | ::ttk::button .bb.search -text {Search} -command searchOnOff |
| 615 | -pack .bb.quit -side left | |
| 616 | -pack .bb.diff2 -side left | |
| 615 | +pack .bb.quit -side left -fill y | |
| 616 | +pack .bb.diff2 -side left -fill y | |
| 617 | 617 | if {[winfo exists .bb.files]} { |
| 618 | - pack .bb.files -side left | |
| 618 | + pack .bb.files -side left -fill y | |
| 619 | 619 | } |
| 620 | -pack .bb.ctxtag .bb.ctx -side left | |
| 621 | -pack .bb.search -side left | |
| 620 | +pack .bb.ctxtag .bb.ctx -side left -fill y | |
| 621 | +pack .bb.search -side left -fill y | |
| 622 | 622 | grid rowconfigure . 1 -weight 1 -minsize [winfo reqheight .nameA] |
| 623 | 623 | grid rowconfigure . 2 -weight 100 |
| 624 | 624 | readMerge |
| 625 | 625 | grid .bb -row 0 -columnspan 8 |
| 626 | 626 | grid .nameA -row 1 -column 1 -sticky ew |
| 627 | 627 |
| --- src/merge.tcl | |
| +++ src/merge.tcl | |
| @@ -610,17 +610,17 @@ | |
| 610 | } |
| 611 | set ::search $w |
| 612 | } |
| 613 | ::ttk::button .bb.quit -text {Quit} -command exit |
| 614 | ::ttk::button .bb.search -text {Search} -command searchOnOff |
| 615 | pack .bb.quit -side left |
| 616 | pack .bb.diff2 -side left |
| 617 | if {[winfo exists .bb.files]} { |
| 618 | pack .bb.files -side left |
| 619 | } |
| 620 | pack .bb.ctxtag .bb.ctx -side left |
| 621 | pack .bb.search -side left |
| 622 | grid rowconfigure . 1 -weight 1 -minsize [winfo reqheight .nameA] |
| 623 | grid rowconfigure . 2 -weight 100 |
| 624 | readMerge |
| 625 | grid .bb -row 0 -columnspan 8 |
| 626 | grid .nameA -row 1 -column 1 -sticky ew |
| 627 |
| --- src/merge.tcl | |
| +++ src/merge.tcl | |
| @@ -610,17 +610,17 @@ | |
| 610 | } |
| 611 | set ::search $w |
| 612 | } |
| 613 | ::ttk::button .bb.quit -text {Quit} -command exit |
| 614 | ::ttk::button .bb.search -text {Search} -command searchOnOff |
| 615 | pack .bb.quit -side left -fill y |
| 616 | pack .bb.diff2 -side left -fill y |
| 617 | if {[winfo exists .bb.files]} { |
| 618 | pack .bb.files -side left -fill y |
| 619 | } |
| 620 | pack .bb.ctxtag .bb.ctx -side left -fill y |
| 621 | pack .bb.search -side left -fill y |
| 622 | grid rowconfigure . 1 -weight 1 -minsize [winfo reqheight .nameA] |
| 623 | grid rowconfigure . 2 -weight 100 |
| 624 | readMerge |
| 625 | grid .bb -row 0 -columnspan 8 |
| 626 | grid .nameA -row 1 -column 1 -sticky ew |
| 627 |