Allow images to be labeld in the ImagePanel.

And label textures in the texture list and pinned texture view.

Author: pmuetschard

gapic/src/main/com/google/gapid/views/FramebufferView.java

@@ -133,7 +133,7 @@ public FramebufferView(Composite parent, Models models, Widgets widgets) {
     picker = withLayoutData(new AttachmentPicker(content, widgets, this::updateBuffer),
         new GridData(SWT.FILL, SWT.TOP, true, false));
     imagePanel = withLayoutData(
-        new ImagePanel(content, View.Framebuffer, models.analytics, widgets),
+        new ImagePanel(content, false, View.Framebuffer, models.analytics, widgets),
         new GridData(SWT.FILL, SWT.FILL, true, true));
 
     imagePanel.createToolbar(toolBar, widgets.theme);

gapic/src/main/com/google/gapid/views/TextureView.java

@@ -100,7 +100,8 @@ public TextureWidget(Composite parent, boolean pinned, Models models, Widgets wi
       setLayout(new FillLayout(SWT.VERTICAL));
       Composite imageAndToolbar = createComposite(this, new GridLayout(2, false));
       ToolBar toolBar = new ToolBar(imageAndToolbar, SWT.VERTICAL | SWT.FLAT);
-      imagePanel = new ImagePanel(imageAndToolbar, View.TextureView, models.analytics, widgets);
+      imagePanel =
+          new ImagePanel(imageAndToolbar, true, View.TextureView, models.analytics, widgets);
 
       toolBar.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, true));
       imagePanel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
@@ -166,10 +167,22 @@ protected void onUiThreadError(String error) {
     }
 
     protected void setImage(FetchedImage result) {
+      imagePanel.setLabel(getLabel(textureResource));
       imagePanel.setImage(result);
       pinItem.setEnabled(!pinned);
     }
 
+    private static String getLabel(Service.Resource resource) {
+      if (resource == null) {
+        return "Texture";
+      }
+      String label = resource.getHandle();
+      if (!resource.getLabel().isEmpty()) {
+        label += " " + resource.getLabel();
+      }
+      return label;
+    }
+
     /**
      * Action for the {@link ToolItem} that allows the user to jump to references of the currently
      * displayed texture.

gapic/src/main/com/google/gapid/widgets/ImagePanel.java

@@ -23,6 +23,7 @@
 import static com.google.gapid.widgets.Widgets.createBaloonToolItem;
 import static com.google.gapid.widgets.Widgets.createCheckbox;
 import static com.google.gapid.widgets.Widgets.createComposite;
+import static com.google.gapid.widgets.Widgets.createGroup;
 import static com.google.gapid.widgets.Widgets.createLabel;
 import static com.google.gapid.widgets.Widgets.createSeparator;
 import static com.google.gapid.widgets.Widgets.createToggleToolItem;
@@ -83,6 +84,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Scale;
 import org.eclipse.swt.widgets.ScrollBar;
@@ -127,8 +129,9 @@ public class ImagePanel extends Composite implements Loadable {
   private final Analytics analytics;
   private final Widgets widgets;
   private final SingleInFlight imageRequestController = new SingleInFlight();
-  protected final LoadablePanel<ImageComponent> loading;
+  protected final LoadablePanel<Composite> loading;
   private final StatusBar status;
+  private final Group group;
   protected final ImageComponent imageComponent;
   private final BackgroundSelection backgroundSelection;
   private ToolItem zoomFitItem, zoomActualItem, backgroundItem, saveItem, colorChanelsItem;
@@ -141,7 +144,8 @@ public enum ZoomMode {
     ZOOM_MANUAL
   }
 
-  public ImagePanel(Composite parent, View view, Analytics analytics, Widgets widgets) {
+  public ImagePanel(
+      Composite parent, boolean labeled, View view, Analytics analytics, Widgets widgets) {
     super(parent, SWT.NONE);
     this.analyticsView = view;
     this.analytics = analytics;
@@ -150,10 +154,16 @@ public ImagePanel(Composite parent, View view, Analytics analytics, Widgets widg
 
     setLayout(Widgets.withMargin(new GridLayout(1, false), 5, 2));
 
-    loading = LoadablePanel.create(this, widgets, panel ->
-        new ImageComponent(panel, widgets.theme, this::showAlphaWarning));
+    loading = LoadablePanel.create(this, widgets, p -> createComposite(p, new FillLayout()));
     status = new StatusBar(this, widgets.theme, this::loadLevel, this::setAlphaEnabled);
-    imageComponent = loading.getContents();
+
+    Composite container = loading.getContents();
+    if (labeled) {
+      container = group = createGroup(container, "Image");
+    } else {
+      group = null;
+    }
+    imageComponent = new ImageComponent(container, widgets.theme, this::showAlphaWarning);
 
     loading.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
     status.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, true, false));
@@ -504,6 +514,10 @@ public void clearImage() {
     imageComponent.setImages(layers);
   }
 
+  public void setLabel(String label) {
+    group.setText(label);
+  }
+
   private void loadLevel(int requestedLecel) {
     if (image.getLevelCount() == 0) {
       clearImage();