From c6d973ec6ddf2613d1afec1f4bdc8bfdc74ff2d5 Mon Sep 17 00:00:00 2001
From: JJ Allaire <jj@rstudio.com>
Date: Mon, 23 Mar 2020 07:04:22 -0400
Subject: [PATCH] don't show size ui for image with no natural sizes

---
 .../client/panmirror/dialogs/PanmirrorEditImageDialog.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gwt/src/org/rstudio/studio/client/panmirror/dialogs/PanmirrorEditImageDialog.java b/src/gwt/src/org/rstudio/studio/client/panmirror/dialogs/PanmirrorEditImageDialog.java
index 6bfe32e17ba..57a1be6eaaa 100644
--- a/src/gwt/src/org/rstudio/studio/client/panmirror/dialogs/PanmirrorEditImageDialog.java
+++ b/src/gwt/src/org/rstudio/studio/client/panmirror/dialogs/PanmirrorEditImageDialog.java
@@ -173,7 +173,7 @@ public PanmirrorEditImageDialog(PanmirrorImageProps props,
       // (i.e. not an insert operation) and there aren't width or height attributes 
       // within props.keyvalue (which is an indicator that they use units unsupported
       // by our sizing UI (e.g. ch, em, etc.)
-      if (editAttributes && dims_ != null && !hasSizeKeyvalue(props.keyvalue))
+      if (editAttributes && dims_ != null && hasNaturalSizes(dims) && !hasSizeKeyvalue(props.keyvalue))
       {
          imageTab.add(sizePanel);
       }
@@ -404,6 +404,11 @@ private static boolean hasSizeKeyvalue(String[][] keyvalue)
       return false;
    }
    
+   private static boolean hasNaturalSizes(PanmirrorImageDimensions dims)
+   {
+      return dims.naturalWidth != null && dims.naturalHeight != null;
+   }
+   
    // resources
    private static PanmirrorDialogsResources RES = PanmirrorDialogsResources.INSTANCE;