Skip to content

Commit 1ed62c8

Browse files
committed
Remove explicit disabled icons from org.eclipse.ui.intro
Use on-the-fly-generated disabled version of SVG-rasterized icons instead.
1 parent 8b8c86f commit 1ed62c8

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/AbstractIntroPartImplementation.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ public abstract class AbstractIntroPartImplementation {
6161
setToolTipText(Messages.Browser_backwardButton_tooltip);
6262
setImageDescriptor(ImageUtil
6363
.createImageDescriptor("full/elcl16/backward_nav.svg")); //$NON-NLS-1$
64-
setDisabledImageDescriptor(ImageUtil
65-
.createImageDescriptor("full/dlcl16/backward_nav.png")); //$NON-NLS-1$
6664
}
6765

6866
@Override
@@ -77,8 +75,6 @@ public void run() {
7775
setToolTipText(Messages.Browser_forwardButton_tooltip);
7876
setImageDescriptor(ImageUtil
7977
.createImageDescriptor("full/elcl16/forward_nav.svg")); //$NON-NLS-1$
80-
setDisabledImageDescriptor(ImageUtil
81-
.createImageDescriptor("full/dlcl16/forward_nav.png")); //$NON-NLS-1$
8278
}
8379

8480
@Override
@@ -93,8 +89,6 @@ public void run() {
9389
setToolTipText(Messages.Browser_homeButton_tooltip);
9490
setImageDescriptor(ImageUtil
9591
.createImageDescriptor("full/elcl16/home_nav.svg")); //$NON-NLS-1$
96-
setDisabledImageDescriptor(ImageUtil
97-
.createImageDescriptor("full/dlcl16/home_nav.png")); //$NON-NLS-1$
9892
}
9993

10094
@Override

ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/BrowserIntroPartImplementation.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ private final class ReduceAction extends Action {
8787
setToolTipText(Messages.Browser_reduce_tooltip);
8888
setImageDescriptor(ImageUtil
8989
.createImageDescriptor("full/elcl16/reduce_font.svg")); //$NON-NLS-1$
90-
setDisabledImageDescriptor(ImageUtil
91-
.createImageDescriptor("full/dlcl16/reduce_font.png")); //$NON-NLS-1$
9290
int scalePercent = FontSelection.getScalePercentage();
9391
setEnabled(scalePercent > -40);
9492
}
@@ -107,8 +105,6 @@ private final class MagnifyAction extends Action {
107105
setToolTipText(Messages.Browser_magnify_tooltip);
108106
setImageDescriptor(ImageUtil
109107
.createImageDescriptor("full/elcl16/magnify_font.svg")); //$NON-NLS-1$
110-
setDisabledImageDescriptor(ImageUtil
111-
.createImageDescriptor("full/dlcl16/magnify_font.png")); //$NON-NLS-1$
112108
int scalePercent = FontSelection.getScalePercentage();
113109
setEnabled(scalePercent < 100);
114110
}
@@ -454,8 +450,8 @@ private Document resolveDynamicContent(AbstractIntroPage page,
454450

455451
// get the array version of the nodelist to work around DOM api design.
456452
Node[] nodes = ModelUtil.getArray(contentProviders);
457-
for (int i = 0; i < nodes.length; i++) {
458-
Element contentProviderElement = (Element) nodes[i];
453+
for (Node node : nodes) {
454+
Element contentProviderElement = (Element) node;
459455
IntroContentProvider provider = new IntroContentProvider(
460456
contentProviderElement, page.getBundle());
461457
provider.setParent(page);
@@ -494,10 +490,10 @@ private Document resolveDynamicContent(AbstractIntroPage page,
494490

495491
private void reinjectDynamicContent(Document dom,
496492
Node[] contentProviderElements) {
497-
for (int i = 0; i < contentProviderElements.length; i++) {
493+
for (Node contentProviderElement2 : contentProviderElements) {
498494
// for each cached contentProvider, find replacement div in DOM and
499495
// re-subsitute.
500-
Element contentProviderElement = (Element) contentProviderElements[i];
496+
Element contentProviderElement = (Element) contentProviderElement2;
501497
Element contentProviderDiv = ModelUtil.getElementById(dom,
502498
contentProviderElement
503499
.getAttribute(IIntroHTMLConstants.ATTRIBUTE_ID),

0 commit comments

Comments
 (0)