From 0c114992113b8f1a505f0ced22371cb2c65244d5 Mon Sep 17 00:00:00 2001 From: Jesper Eskilson Date: Thu, 2 Nov 2017 16:20:11 +0100 Subject: [PATCH] Bug 242705: Fix misaligned breakpoint icon This commit fixes the "misalignment" of the breakpoint icon by replacing it with the same icon as JDT uses. Change-Id: I5a205a095dd37f61774adbf0fc61378ad29fe2bf Signed-off-by: Jesper Eskilson --- .../icons/obj16/brkp_obj.gif | Bin 183 -> 0 bytes .../icons/obj16/brkp_obj.png | Bin 0 -> 245 bytes .../icons/obj16/brkpd_obj.gif | Bin 130 -> 0 bytes .../icons/obj16/brkpd_obj.png | Bin 0 -> 229 bytes debug/org.eclipse.cdt.debug.ui/plugin.xml | 2 +- .../cdt/debug/internal/ui/CDebugImages.java | 4 ++-- 6 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 debug/org.eclipse.cdt.debug.ui/icons/obj16/brkp_obj.gif create mode 100644 debug/org.eclipse.cdt.debug.ui/icons/obj16/brkp_obj.png delete mode 100644 debug/org.eclipse.cdt.debug.ui/icons/obj16/brkpd_obj.gif create mode 100644 debug/org.eclipse.cdt.debug.ui/icons/obj16/brkpd_obj.png diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/brkp_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/brkp_obj.gif deleted file mode 100644 index 3d86f92dc798f2e6923c3d4fe08fb7d78e196bcd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 183 zcmZ?wbhEHb6krfwIKsf77h138S7esdowM|G_WZ-m>(4f=JJYo0#EhL6R-Sse<>J%e zsr#a49V%XVX2PBu6Zc%7aqxEJtONi5|7Rc$DE?$&WMB|t&;cn2*~!3avOuLTC39ZJ zs&zT9_jL+zbiQKfXkzfwl9}+paRL{QME41W2g)Y%Sd?CcRY+8c3{~7-H?h`1`$;UR09eOh}Y~}6l@S)`K5TuhTn5`UHqTZx9Y!kaM>54 z4bcfHf1W;R!~ecr*Wfs!ap8B3z~aqB8KCB0{5NIZq5tWNj=^!vtH3CW;hz>}N vfZ|-8(25soentN^0!wa!Vr4XK(g*+mOQ2xZ59~7100000NkvXXu0mjfX%}i~ literal 0 HcmV?d00001 diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/brkpd_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/brkpd_obj.gif deleted file mode 100644 index c9e344f167d78d8bbc2d12d029d4f0919b907eba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 130 zcmZ?wbhEHb6krfw*v!E2`1KF}0RR90|DQa0a@)3T?d|PVRaKdpnd#~2Nl8hep`k!2 z1|*>PlZBCiftx`GBnC2rfknUIr043r7O&6l{_k8U(rl*Cz@VTyZAsIt6vrI)o7v39 WZW5XejSCbtn7AILTXr%qSOWk}|16CF diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/brkpd_obj.png b/debug/org.eclipse.cdt.debug.ui/icons/obj16/brkpd_obj.png new file mode 100644 index 0000000000000000000000000000000000000000..31f9a9a4eeb3922de1287dfcb7917177b8420a92 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ydl>XLn>}1CrGebG{#SuU+$4{ zqVYq=hwwndKz1f3CZ3LKJRveNvci8;|Ni>AU*4|fNBzr7OaC7}ba!9b^rg#9%Y!|?Ql==RKtP^3&fB2$vPV*9B$+NpPZEJ zCz#q$zo5P>s_Ity1Vx4EZ*FaUogWf%B|JgGLO^zcL--RnH`je1_&@xYmyxOw7SUdu dIoXYYL8Q9GWAUPbe?WILc)I$ztaD0e0s!BJT0{T< literal 0 HcmV?d00001 diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml index ce9b8636f3d..581779100d7 100644 --- a/debug/org.eclipse.cdt.debug.ui/plugin.xml +++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml @@ -1051,7 +1051,7 @@ annotationType="org.eclipse.cdt.debug.core.breakpoint" colorPreferenceKey="breakpointIndicationColor" colorPreferenceValue="0,0,255" - icon="icons/obj16/brkp_obj.gif" + icon="icons/obj16/brkp_obj.png" label="%BreakpointMarkerPreference.label" overviewRulerPreferenceKey="breakpointIndicationInOverviewRuler" overviewRulerPreferenceValue="false" diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImages.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImages.java index f978c314a72..5296acaa08a 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImages.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImages.java @@ -66,8 +66,8 @@ public class CDebugImages { public static final String IMG_OVRS_VARIABLE_CASTED = NAME_PREFIX + "casttype_ovr.gif"; //$NON-NLS-1$ public static final String IMG_OVRS_ARGUMENT = NAME_PREFIX + "argument_ovr.gif"; //$NON-NLS-1$ public static final String IMG_OVRS_GLOBAL = NAME_PREFIX + "global_ovr.gif"; //$NON-NLS-1$ - public static final String IMG_OBJS_BREAKPOINT_ENABLED = NAME_PREFIX + "brkp_obj.gif"; //$NON-NLS-1$ - public static final String IMG_OBJS_BREAKPOINT_DISABLED = NAME_PREFIX + "brkpd_obj.gif"; //$NON-NLS-1$ + public static final String IMG_OBJS_BREAKPOINT_ENABLED = NAME_PREFIX + "brkp_obj.png"; //$NON-NLS-1$ + public static final String IMG_OBJS_BREAKPOINT_DISABLED = NAME_PREFIX + "brkpd_obj.png"; //$NON-NLS-1$ public static final String IMG_OBJS_HWBREAKPOINT_ENABLED = NAME_PREFIX + "hwbrkp_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_HWBREAKPOINT_DISABLED = NAME_PREFIX + "hwbrkpd_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_ADDRESS_BREAKPOINT_ENABLED = NAME_PREFIX + "addrbrkp_obj.gif"; //$NON-NLS-1$