From b1011b0a82a78810d9a4ab5e89cb1cd95852533a Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Fri, 24 Jun 2022 20:04:39 -0400 Subject: [PATCH] Bug 580248: Allow widget baseline to be less than font baseline The removed assertion was overly harsh and some combinations of fonts and text meant that the assertion was being hit. This code was based on LineNumberRulerColumn (platform.text) which has long since removed the assertion - see https://github.com/eclipse-platform/eclipse.platform.text/commit/3e70d44d645967b04bc2b78701c0aadc0141004b for the removed assertion. Note that this change simply removes the assertion and does not address all the possibilities of mixed fonts. I suspect that there may be some (hopefully) small drawing errors if such mixed fonts are used. This code (unlike platform text) will continue to assume all lines are the same height. Change-Id: I3801b05c96e2784aabe53b3a503dbdb86e6e10c0 --- .../ui/disassembly/provisional/DisassemblyRulerColumn.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblyRulerColumn.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblyRulerColumn.java index afd783df9cc..a8b970c1e8c 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblyRulerColumn.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblyRulerColumn.java @@ -893,9 +893,8 @@ public class DisassemblyRulerColumn extends AbstractContributedRulerColumn imple int widgetBaseline = fCachedTextWidget.getBaseline(); FontMetrics fm = gc.getFontMetrics(); int fontBaseline = fm.getAscent() + fm.getLeading(); - Assert.isTrue(widgetBaseline >= fontBaseline); int baselineBias = widgetBaseline - fontBaseline; - return baselineBias; + return Math.max(0, baselineBias); } /**