Changeset 21

Timestamp:

11/27/06 10:49:02 (2 years ago)

Author:

baxissimo

Message:

Added checkbox and slider to dxut.d.
Also fixed bone-headed != when I meant !is bug.

Files:

• trunk/luigi/doc/example1_DXUT_LAF.png (modified) (previous)
• trunk/luigi/example1.d (modified) (3 diffs)
• trunk/luigi/gui.d (modified) (2 diffs)
• trunk/luigi/themes/dxut.d (modified) (3 diffs)

trunk/luigi/example1.d

@@ -66 +66 @@
-{
-    bool dosync = true;
-std
+dxut
-    
-    //---------------- PARSE ARGS -----------------------
@@ -99 +99 @@
-    with(luigui) {
-        Luigi().adapter = GLFWAdapter();
-
+ || theme == "dx"
-            Luigi().theme = new luigi.themes.dxut.DXUTTheme();
-        }
@@ -242 +242 @@
-            char[] titlestr = format("Spinning Triangle (%0.1f FPS)", fps);
-            if (dosync) { titlestr ~= " [vsync]"; }
-itlestr
+oStringz(titlestr)
-            t0 = t;
-            frames = 0;

trunk/luigi/gui.d

@@ -1109 +1109 @@
-        Widget target;
-        target = find_item_at_point(Point(ev.winx,ev.winy));
-=
+is
-            _EnterEvent eev;
-            if (m_hoverItem) 
@@ -1270 +1270 @@
-    override double value(double v) { return m_checked=(v!=0); }
-    override double value() { return m_checked; }
+    bool checked(bool v) { return m_checked=v; }
+    bool checked() { return m_checked; }
-
-    override void on_key(KeyEvent ev)

trunk/luigi/themes/dxut.d

@@ -170 +170 @@
-    }
-
+    void draw_elem_sprite(inout Element elem, inout Rect rect) {
+        if (elem.texColor.alpha == 0) 
+            return;
+        glEnable(GL_TEXTURE_2D);
+        set_color(elem.texColor.current);
+        fill_rect(rect, elem.texRect);
+    }
+    void draw_elem_sprite(inout Element elem, inout Rect rect, int[4] texRect) {
+        if (elem.texColor.alpha == 0) 
+            return;
+        glEnable(GL_TEXTURE_2D);
+        set_color(elem.texColor.current);
+        fill_rect(rect, texRect);
+    }
+    void draw_elem_text(inout Element elem, char[] text, Rect rect, bool shadow=false)
+    {
+        if (elem.fontColor.alpha == 0)
+            return;
+        glDisable(GL_TEXTURE_2D);
+        if (shadow) {
+            set_color(0);
+            rect.x+=1; rect.y+=1;
+            draw_text_centered(elem.font, text, rect);
+            rect.x-=1; rect.y-=1;
+        }
+        set_color(elem.fontColor.current);
+        draw_text_centered(elem.font, text, rect);
+    }
-    //----LABEL---------------------------------------------------------------
-    void label_register() {
@@ -199 +227 @@
-    Size button_min_size(Widget widget, Size bounds) {
-        auto w = cast(Button)widget; assert(w);
-
+
+
-        return Size(r.width+20,r.height+8);
-    }
@@ -261 +290 @@
-        }
-    }
+    //----CHECKBOX----------------------------------------------------------
-    void checkbox_register() {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    void textfield_register() {
-    }
+    //----SLIDER------------------------------------------------------------
-    void slider_register() {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    void panel_register() {
-    }
+    //----SPINNER-----------------------------------------------------------
-    void spinner_register() {
-    }
+    //----RADIOGROUP--------------------------------------------------------
-    void radiogroup_register() {
-    }
+    //----RADIOBUTTON-------------------------------------------------------
-    void radiobutton_register() {
-    }