From 917f82d3bc0711f951752a93ed571072f49b0aad Mon Sep 17 00:00:00 2001
From: David Inglis <dinglis@qnx.com>
Date: Fri, 10 Sep 2004 02:27:59 +0000
Subject: [PATCH] fixed gap between image and text in CView and PojectsView

---
 core/org.eclipse.cdt.ui/ChangeLog                         | 8 ++++++++
 .../cdt/internal/ui/browser/cbrowsing/ProjectsView.java   | 8 +++++---
 .../src/org/eclipse/cdt/internal/ui/cview/CView.java      | 4 +++-
 .../eclipse/cdt/internal/ui/cview/CViewLabelProvider.java | 7 -------
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 73f32a23326..f89c649f8a0 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-09 David Inglis
+
+	Fix large gap between image and text in CView and ProjectView
+
+	* browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/ProjectsView.java
+	* src/org/eclipse/cdt/internal/ui/cview/CView.java
+	* src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java
+	
 2004-09-09 David Inglis
 	Fix for 36837 - CVS decoration updating
 
diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/ProjectsView.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/ProjectsView.java
index b3847f8e60a..9c8e7d31505 100644
--- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/ProjectsView.java
+++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/ProjectsView.java
@@ -23,7 +23,8 @@ import org.eclipse.cdt.core.model.IStructure;
 import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.cdt.core.model.ITypeDef;
 import org.eclipse.cdt.internal.ui.ICHelpContextIds;
-import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider;
+import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
+import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.PreferenceConstants;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -55,8 +56,9 @@ public class ProjectsView extends CBrowsingPart {
 	}
 
 	protected LabelProvider createLabelProvider() {
-		return new CUILabelProvider();
-//		return new TypeInfoLabelProvider(TypeInfoLabelProvider.SHOW_TYPE_ONLY);
+		return new AppearanceAwareLabelProvider(
+				AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS,
+				AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS | CElementImageProvider.SMALL_ICONS );
 	}
 	
 	/* (non-Javadoc)
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java
index 04081d8e54e..44d47f0d07c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java
@@ -34,6 +34,8 @@ import org.eclipse.cdt.internal.ui.drag.TransferDragSourceListener;
 import org.eclipse.cdt.internal.ui.preferences.CPluginPreferencePage;
 import org.eclipse.cdt.internal.ui.util.EditorUtility;
 import org.eclipse.cdt.internal.ui.util.ProblemTreeViewer;
+import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
+import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider;
 import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider;
 import org.eclipse.cdt.internal.ui.viewsupport.DecoratingCLabelProvider;
 import org.eclipse.cdt.ui.CElementContentProvider;
@@ -565,7 +567,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha
 	}
 
 	protected CUILabelProvider createLabelProvider() {
-		return new CViewLabelProvider();
+		return new CViewLabelProvider(AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS, AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS | CElementImageProvider.SMALL_ICONS);
 	}
 
 	/*
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java
index 410757e8488..69d53c53442 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java
@@ -27,13 +27,6 @@ import org.eclipse.swt.graphics.Image;
  */
 public class CViewLabelProvider extends StandardCElementLabelProvider {
 	
-	/**
-	 * 
-	 */
-	public CViewLabelProvider() {
-		super();
-	}
-
 	/**
 	 * @param flags
 	 * @param adormentProviders