factor measureCode out of EditDialog

rstudio · Nov 20, 2011 · 2a321a8 · 2a321a8
1 parent 59baf29
commit 2a321a8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/gwt/src/org/rstudio/core/client/dom/DomMetrics.java b/src/gwt/src/org/rstudio/core/client/dom/DomMetrics.java
@@ -17,6 +17,7 @@
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.RootPanel;
 import org.rstudio.core.client.Size;
+import org.rstudio.core.client.widget.FontSizer;
 
 public class DomMetrics
 { 
@@ -41,6 +42,13 @@ public static Size measureHTML(String html, String styleName)
       return textSize; 
    }
 
+   public static Size measureCode(String code)
+   {
+      return DomMetrics.measureHTML(
+            "<pre>" + DomUtils.textToPreHtml(code) + "</pre>",
+            "ace_editor " + FontSizer.getNormalFontSizeClass());
+   }
+
    public static Size adjustedElementSize(Size contentSize, 
                                           Size minimumSize,
                                           int contentPad,

diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/edit/ui/EditDialog.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/edit/ui/EditDialog.java
@@ -19,7 +19,6 @@
 import com.google.gwt.user.client.ui.Widget;
 import org.rstudio.core.client.Size;
 import org.rstudio.core.client.dom.DomMetrics;
-import org.rstudio.core.client.dom.DomUtils;
 import org.rstudio.core.client.widget.*;
 import org.rstudio.studio.client.common.filetypes.FileTypeRegistry;
 import org.rstudio.studio.client.workbench.views.source.editors.text.AceEditor;
@@ -56,21 +55,14 @@ public void onClick(ClickEvent event)
       setButtonAlignment(HasHorizontalAlignment.ALIGN_RIGHT);
    }
 
-   private static Size measureText(String text)
-   {
-      return DomMetrics.measureHTML(
-            "<pre>" + DomUtils.textToPreHtml(text) + "</pre>",
-            "ace_editor " + FontSizer.getNormalFontSizeClass());
-   }
-
    @Override
    protected Widget createMainWidget()
    {
       // line numbers
       final int LINE_NUMBERS_WIDTH = 100;
 
       // calculate the size of the text the adjust for line numbers
-      Size textSize = measureText(sourceText_);
+      Size textSize = DomMetrics.measureCode(sourceText_);
       textSize = new Size(textSize.width + LINE_NUMBERS_WIDTH,
                           textSize.height);