Fossil

Check-in [db04882760]
Login

Check-in [db04882760]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Try dynamic calculation of the top and bottom paddings of inserted and deleted text so that the background color extends exactly to the line height (using the `calc()' CSS function). In Chromium, `overflow-y: hidden' is required so that the table cell containing the diff line doesn't display vertical scrollbars (without otherwise changing the visual result).
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | diff-word-wrap
Files: files | file ages | folders
SHA3-256: db04882760ace54c7f263a0e9b23c187020a9c720de4fd5fa3496fca89004fbe
User & Date: florian 2024-09-20 03:57:00.000
Context
2024-12-12
17:07
Sync with trunk. ... (check-in: 878a56bc98 user: florian tags: diff-word-wrap)
2024-09-20
03:57
Try dynamic calculation of the top and bottom paddings of inserted and deleted text so that the background color extends exactly to the line height (using the `calc()' CSS function). In Chromium, `overflow-y: hidden' is required so that the table cell containing the diff line doesn't display vertical scrollbars (without otherwise changing the visual result). ... (check-in: db04882760 user: florian tags: diff-word-wrap)
03:50
Sync with trunk. ... (check-in: ef298b282a user: florian tags: diff-word-wrap)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/default.css.
︙︙
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584

  line-height: 1.275;
  text-size-adjust: none;
  white-space: pre-wrap;
  word-wrap: break-word;
}
table.diff td del,
table.diff td ins {
  padding: 0.062em 0 0.062em 0;
  text-decoration: none;
}
table.diff td.diffln {
  width: 0%;
  text-align: right;
  padding: 0 0.16em 0 0.32em;
}








|








570
571
572
573
574
575
576
577
578
579
580
581
582
583
584

  line-height: 1.275;
  text-size-adjust: none;
  white-space: pre-wrap;
  word-wrap: break-word;
}
table.diff td del,
table.diff td ins {
  padding: calc((1em*1.275 - 1em)/2) 0;
  text-decoration: none;
}
table.diff td.diffln {
  width: 0%;
  text-align: right;
  padding: 0 0.16em 0 0.32em;
}
︙︙
656
657
658
659
660
661
662

663
664
665
666
667
668
669

  cursor: pointer;
  opacity: 1;
  filter: contrast(1);
}
td.difftxt {
  max-width: 0;
  overflow-x: hidden;

}
td.difftxtu {
  width: 100%;
}
td.difftxtl,
td.difftxtr {
  width: 50%;








>








656
657
658
659
660
661
662
663
664
665
666
667
668
669
670

  cursor: pointer;
  opacity: 1;
  filter: contrast(1);
}
td.difftxt {
  max-width: 0;
  overflow-x: hidden;
  overflow-y: hidden;
}
td.difftxtu {
  width: 100%;
}
td.difftxtl,
td.difftxtr {
  width: 50%;
︙︙
Changes to src/diffcmd.c.
︙︙
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273

274
275
276
277
278
279
280

@   line-height: 1.275;
@   text-size-adjust: none;
@   white-space: pre-wrap;
@   word-wrap: break-word;
@ }
@ table.diff td del,
@ table.diff td ins {
@   padding: 0.062em 0 0.062em 0;
@   text-decoration: none;
@ }
@ table.diff td.diffln {
@   width: 0%;
@   text-align: right;
@   padding: 0 0.16em 0 0.32em;
@ }
@ table.diff td.difflne {
@   text-align: left;
@   padding: 0 0.32em;
@ }
@ table.diff td.diffsep {
@   width: 0%;
@   padding: 0 0.32em 0 0.16em;
@ }
@ td.difftxt {
@   max-width: 0;
@   overflow-x: hidden;

@ }
@ td.difftxtu {
@   width: 100%;
@ }
@ td.difftxtl,
@ td.difftxtr {
@   width: 50%;








|


















>








248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281

@   line-height: 1.275;
@   text-size-adjust: none;
@   white-space: pre-wrap;
@   word-wrap: break-word;
@ }
@ table.diff td del,
@ table.diff td ins {
@   padding: calc((1em*1.275 - 1em)/2) 0;
@   text-decoration: none;
@ }
@ table.diff td.diffln {
@   width: 0%;
@   text-align: right;
@   padding: 0 0.16em 0 0.32em;
@ }
@ table.diff td.difflne {
@   text-align: left;
@   padding: 0 0.32em;
@ }
@ table.diff td.diffsep {
@   width: 0%;
@   padding: 0 0.32em 0 0.16em;
@ }
@ td.difftxt {
@   max-width: 0;
@   overflow-x: hidden;
@   overflow-y: hidden;
@ }
@ td.difftxtu {
@   width: 100%;
@ }
@ td.difftxtl,
@ td.difftxtr {
@   width: 50%;
︙︙
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393

394
395
396
397
398
399
400

@   line-height: 1.275;
@   text-size-adjust: none;
@   white-space: pre-wrap;
@   word-wrap: break-word;
@ }
@ table.diff td del,
@ table.diff td ins {
@   padding: 0.062em 0 0.062em 0;
@   text-decoration: none;
@ }
@ table.diff td.diffln {
@   width: 0%;
@   text-align: right;
@   padding: 0 0.16em 0 0.32em;
@ }
@ table.diff td.difflne {
@   text-align: left;
@   padding: 0 0.32em;
@ }
@ table.diff td.diffsep {
@   width: 0%;
@   padding: 0 0.32em 0 0.16em;
@ }
@ td.difftxt {
@   max-width: 0;
@   overflow-x: hidden;

@ }
@ td.difftxtu {
@   width: 100%;
@ }
@ td.difftxtl,
@ td.difftxtr {
@   width: 50%;








|


















>








369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402

@   line-height: 1.275;
@   text-size-adjust: none;
@   white-space: pre-wrap;
@   word-wrap: break-word;
@ }
@ table.diff td del,
@ table.diff td ins {
@   padding: calc((1em*1.275 - 1em)/2) 0;
@   text-decoration: none;
@ }
@ table.diff td.diffln {
@   width: 0%;
@   text-align: right;
@   padding: 0 0.16em 0 0.32em;
@ }
@ table.diff td.difflne {
@   text-align: left;
@   padding: 0 0.32em;
@ }
@ table.diff td.diffsep {
@   width: 0%;
@   padding: 0 0.32em 0 0.16em;
@ }
@ td.difftxt {
@   max-width: 0;
@   overflow-x: hidden;
@   overflow-y: hidden;
@ }
@ td.difftxtu {
@   width: 100%;
@ }
@ td.difftxtl,
@ td.difftxtr {
@   width: 50%;
︙︙