Prechádzať zdrojové kódy

💄 Update default styling for UIObjects

- Fonts are now handled in real time for resing, and not from CSS.
Pedro Schneider 3 rokov pred
rodič
commit
3ce204dc7a

+ 1 - 1
pandora/game_objects/ui_objects/Button.js

@@ -30,7 +30,7 @@ class Button extends UIObject
         this.P5Element.html(label);
         this.P5Element.position(0, 0);
 
-        this.setStyle(DEFAULT_STYLE);
+        this.setStyle(STYLE.DEFAULT_STYLE);
 
         this.connectCallbacks();
     }

+ 1 - 1
pandora/game_objects/ui_objects/CheckBox.js

@@ -29,7 +29,7 @@ class CheckBox extends UIObject
         this.P5Element = createCheckbox(label, val);
         this.P5Element.position(0, 0);
 
-        this.setStyle(DEFAULT_STYLE);
+        this.setStyle(STYLE.DEFAULT_STYLE);
 
         this.connectCallbacks();
         this.P5Element.changed(this.onChanged);

+ 1 - 1
pandora/game_objects/ui_objects/ColorPicker.js

@@ -27,7 +27,7 @@ class ColorPicker extends UIObject
 
         this.P5Element = createColorPicker(color);
         this.setPosition(0, 0);
-        this.setStyle(DEFAULT_STYLE);
+        this.setStyle(STYLE.DEFAULT_STYLE);
 
         this.connectCallbacks();
     }

+ 2 - 1
pandora/game_objects/ui_objects/Input.js

@@ -27,7 +27,8 @@ class Input extends UIObject
 
         this.P5Element = createInput(value, type);
         this.setPosition(0, 0);
-        this.setStyle(DEFAULT_STYLE);
+        this.setStyle(STYLE.DEFAULT_STYLE);
+        this.size = new Vector2(200, 30);
 
         this.connectCallbacks();
         this.P5Element.input(this.onInput);

+ 2 - 2
pandora/game_objects/ui_objects/Label.js

@@ -26,9 +26,9 @@ class Label extends UIObject
         super(name);
         this.text = text;
         this.P5Element = createDiv(text);
-        this.P5Element.position(0, 0);
+        this.size = new Vector2(200, 50);
 
-        this.setStyle(DEFAULT_STYLE);
+        this.setStyle(STYLE.DEFAULT_STYLE);
 
         this.connectCallbacks();
     }

+ 1 - 1
pandora/game_objects/ui_objects/Radio.js

@@ -27,7 +27,7 @@ class Radio extends UIObject
 
         this.P5Element = createRadio();
         this.setPosition(10, 10);
-        this.setStyle(DEFAULT_STYLE);
+        this.setStyle(STYLE.DEFAULT_STYLE);
         this.multiLine = false;
 
         this.connectCallbacks();

+ 1 - 1
pandora/game_objects/ui_objects/Select.js

@@ -28,7 +28,7 @@ class Select extends UIObject
         this.P5Element = createSelect();
         this.setPosition(0, 0);
         this.setSize(100, 20);
-        this.setStyle(DEFAULT_STYLE);
+        this.setStyle(STYLE.DEFAULT_STYLE);
 
         this.connectCallbacks();
         this.P5Element.changed(this.onChanged);

+ 1 - 1
pandora/game_objects/ui_objects/Slider.js

@@ -27,7 +27,7 @@ class Slider extends UIObject
         this.P5Element = createSlider(min, max, value, step);
         this.setPosition(0, 0);
         this.setSize(200, 25);
-        this.setStyle(DEFAULT_STYLE);
+        this.setStyle(STYLE.DEFAULT_STYLE);
 
         this.connectCallbacks();
         this.P5Element.changed(this.onChanged);

+ 8 - 4
pandora/singletons/Enums.js

@@ -55,7 +55,11 @@ const RENDER_MODES = {
     WEBGL: 2,
 };
 
-const DEFAULT_STYLE = {
-    "font-family": "Lato",
-    "font-size": "12px",
-};
+const STYLE = {
+    DEFAULT_FONT_SIZE: 20,
+
+    DEFAULT_STYLE:
+    {
+        "font-family": "Lato",
+    },
+}