Fossil SCM
Make the default font size is smaller for side-by-side diff. Fix the context-diff so that it understands the dc=N query parameter.
Commit
eae55eeafc0d1152ac46e0df354c392e409afedd
Parent
43cbe9dd5a1d2eb…
2 files changed
+10
-9
+1
+10
-9
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -356,26 +356,27 @@ | ||
| 356 | 356 | */ |
| 357 | 357 | static int construct_diff_flags(int showDiff, int sideBySide){ |
| 358 | 358 | int diffFlags; |
| 359 | 359 | if( showDiff==0 ){ |
| 360 | 360 | diffFlags = 0; /* Zero means do not show any diff */ |
| 361 | - }else if( sideBySide ){ | |
| 361 | + }else{ | |
| 362 | 362 | int x; |
| 363 | - diffFlags = DIFF_SIDEBYSIDE | DIFF_IGNORE_EOLWS; | |
| 363 | + if( sideBySide ){ | |
| 364 | + diffFlags = DIFF_SIDEBYSIDE | DIFF_IGNORE_EOLWS; | |
| 364 | 365 | |
| 365 | - /* "dw" query parameter determines width of each column */ | |
| 366 | - x = atoi(PD("dw","80"))*(DIFF_CONTEXT_MASK+1); | |
| 367 | - if( x<0 || x>DIFF_WIDTH_MASK ) x = DIFF_WIDTH_MASK; | |
| 368 | - diffFlags += x; | |
| 366 | + /* "dw" query parameter determines width of each column */ | |
| 367 | + x = atoi(PD("dw","80"))*(DIFF_CONTEXT_MASK+1); | |
| 368 | + if( x<0 || x>DIFF_WIDTH_MASK ) x = DIFF_WIDTH_MASK; | |
| 369 | + diffFlags += x; | |
| 370 | + }else{ | |
| 371 | + diffFlags = DIFF_INLINE | DIFF_IGNORE_EOLWS; | |
| 372 | + } | |
| 369 | 373 | |
| 370 | 374 | /* "dc" query parameter determines lines of context */ |
| 371 | 375 | x = atoi(PD("dc","7")); |
| 372 | 376 | if( x<0 || x>DIFF_CONTEXT_MASK ) x = DIFF_CONTEXT_MASK; |
| 373 | 377 | diffFlags += x; |
| 374 | - }else{ | |
| 375 | - /* In-line (non-side-by-side) diff */ | |
| 376 | - diffFlags = DIFF_INLINE | DIFF_IGNORE_EOLWS; | |
| 377 | 378 | } |
| 378 | 379 | return diffFlags; |
| 379 | 380 | } |
| 380 | 381 | |
| 381 | 382 | |
| 382 | 383 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -356,26 +356,27 @@ | |
| 356 | */ |
| 357 | static int construct_diff_flags(int showDiff, int sideBySide){ |
| 358 | int diffFlags; |
| 359 | if( showDiff==0 ){ |
| 360 | diffFlags = 0; /* Zero means do not show any diff */ |
| 361 | }else if( sideBySide ){ |
| 362 | int x; |
| 363 | diffFlags = DIFF_SIDEBYSIDE | DIFF_IGNORE_EOLWS; |
| 364 | |
| 365 | /* "dw" query parameter determines width of each column */ |
| 366 | x = atoi(PD("dw","80"))*(DIFF_CONTEXT_MASK+1); |
| 367 | if( x<0 || x>DIFF_WIDTH_MASK ) x = DIFF_WIDTH_MASK; |
| 368 | diffFlags += x; |
| 369 | |
| 370 | /* "dc" query parameter determines lines of context */ |
| 371 | x = atoi(PD("dc","7")); |
| 372 | if( x<0 || x>DIFF_CONTEXT_MASK ) x = DIFF_CONTEXT_MASK; |
| 373 | diffFlags += x; |
| 374 | }else{ |
| 375 | /* In-line (non-side-by-side) diff */ |
| 376 | diffFlags = DIFF_INLINE | DIFF_IGNORE_EOLWS; |
| 377 | } |
| 378 | return diffFlags; |
| 379 | } |
| 380 | |
| 381 | |
| 382 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -356,26 +356,27 @@ | |
| 356 | */ |
| 357 | static int construct_diff_flags(int showDiff, int sideBySide){ |
| 358 | int diffFlags; |
| 359 | if( showDiff==0 ){ |
| 360 | diffFlags = 0; /* Zero means do not show any diff */ |
| 361 | }else{ |
| 362 | int x; |
| 363 | if( sideBySide ){ |
| 364 | diffFlags = DIFF_SIDEBYSIDE | DIFF_IGNORE_EOLWS; |
| 365 | |
| 366 | /* "dw" query parameter determines width of each column */ |
| 367 | x = atoi(PD("dw","80"))*(DIFF_CONTEXT_MASK+1); |
| 368 | if( x<0 || x>DIFF_WIDTH_MASK ) x = DIFF_WIDTH_MASK; |
| 369 | diffFlags += x; |
| 370 | }else{ |
| 371 | diffFlags = DIFF_INLINE | DIFF_IGNORE_EOLWS; |
| 372 | } |
| 373 | |
| 374 | /* "dc" query parameter determines lines of context */ |
| 375 | x = atoi(PD("dc","7")); |
| 376 | if( x<0 || x>DIFF_CONTEXT_MASK ) x = DIFF_CONTEXT_MASK; |
| 377 | diffFlags += x; |
| 378 | } |
| 379 | return diffFlags; |
| 380 | } |
| 381 | |
| 382 | |
| 383 |
+1
| --- src/style.c | ||
| +++ src/style.c | ||
| @@ -754,10 +754,11 @@ | ||
| 754 | 754 | @ line-height: 100%; |
| 755 | 755 | }, |
| 756 | 756 | { "div.sbsdiff", |
| 757 | 757 | "side-by-side diff display", |
| 758 | 758 | @ font-family: monospace; |
| 759 | + @ font-size: smaller; | |
| 759 | 760 | @ white-space: pre; |
| 760 | 761 | }, |
| 761 | 762 | { "div.udiff", |
| 762 | 763 | "context diff display", |
| 763 | 764 | @ font-family: monospace; |
| 764 | 765 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -754,10 +754,11 @@ | |
| 754 | @ line-height: 100%; |
| 755 | }, |
| 756 | { "div.sbsdiff", |
| 757 | "side-by-side diff display", |
| 758 | @ font-family: monospace; |
| 759 | @ white-space: pre; |
| 760 | }, |
| 761 | { "div.udiff", |
| 762 | "context diff display", |
| 763 | @ font-family: monospace; |
| 764 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -754,10 +754,11 @@ | |
| 754 | @ line-height: 100%; |
| 755 | }, |
| 756 | { "div.sbsdiff", |
| 757 | "side-by-side diff display", |
| 758 | @ font-family: monospace; |
| 759 | @ font-size: smaller; |
| 760 | @ white-space: pre; |
| 761 | }, |
| 762 | { "div.udiff", |
| 763 | "context diff display", |
| 764 | @ font-family: monospace; |
| 765 |