Skip to content

GitLab

A
appinventor-sources
Commit 6cc36bd7 authored by Evan W. Patton's avatar Evan W. Patton Committed by Susan Rati Lane
Browse files
Options

Fix MockSwitch sizing and positioning interactions with FontSize

parent 41597f9b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
appinventor/appengine/src/com/google/appinventor/client/editor/simple/components/MockSwitch.java
View file @ 6cc36bd7
...@@ -9,6 +9,7 @@ import com.google.appinventor.client.editor.simple.SimpleEditor; ...@@ -9,6 +9,7 @@ import com.google.appinventor.client.editor.simple.SimpleEditor;
import com.google.appinventor.client.editor.simple.components.utils.SVGPanel; import com.google.appinventor.client.editor.simple.components.utils.SVGPanel;
import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.ui.HasHorizontalAlignment; import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HasVerticalAlignment;
import com.google.gwt.user.client.ui.InlineHTML; import com.google.gwt.user.client.ui.InlineHTML;
import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.client.ui.Widget;
...@@ -84,7 +85,7 @@ public final class MockSwitch extends MockToggleBase<HorizontalPanel> { ...@@ -84,7 +85,7 @@ public final class MockSwitch extends MockToggleBase<HorizontalPanel> {
isInitialized = true; isInitialized = true;
} }
switchGraphic = new SVGPanel(); switchGraphic = new SVGPanel();
int switchHeight = Math.round(Float.parseFloat(getPropertyValue(MockVisibleComponent.PROPERTY_NAME_FONTSIZE))); int switchHeight = 14; // pixels (Android asset is 28 px at 160 dpi)
int switchWidth = (int) Math.round(switchHeight * 2); int switchWidth = (int) Math.round(switchHeight * 2);
switchGraphic.setWidth(switchWidth + "px"); switchGraphic.setWidth(switchWidth + "px");
...@@ -98,6 +99,7 @@ public final class MockSwitch extends MockToggleBase<HorizontalPanel> { ...@@ -98,6 +99,7 @@ public final class MockSwitch extends MockToggleBase<HorizontalPanel> {
panel.add(switchGraphic); panel.add(switchGraphic);
panel.setCellWidth(switchGraphic, switchWidth + "px"); panel.setCellWidth(switchGraphic, switchWidth + "px");
panel.setCellHorizontalAlignment(switchGraphic, HasHorizontalAlignment.ALIGN_RIGHT); panel.setCellHorizontalAlignment(switchGraphic, HasHorizontalAlignment.ALIGN_RIGHT);
panel.setCellVerticalAlignment(switchGraphic, HasVerticalAlignment.ALIGN_MIDDLE);
toggleWidget = panel; toggleWidget = panel;
refreshForm(); refreshForm();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment