Changeset 23

Timestamp:

12/02/06 02:16:47 (2 years ago)

Author:

baxissimo

Message:

dxut theme's textfield works now.

Files:

• trunk/luigi/base.d (modified) (2 diffs)
• trunk/luigi/example1.d (modified) (2 diffs)
• trunk/luigi/gui.d (modified) (1 diff)
• trunk/luigi/signalobj.d (modified) (2 diffs)
• trunk/luigi/theme.d (modified) (4 diffs)
• trunk/luigi/themes/dxut.d (modified) (18 diffs)

trunk/luigi/base.d

@@ -81 +81 @@
-        x = rx; y = ry; w = rw; h = rh;
-    }
+    /** Value setter using point values */
+    void  setLTRB(float leftx, float topy, float rightx, float bottomy) {
+        set(leftx,topy,rightx-leftx,bottomy-topy);
+    }
-
-    /** Point-inside-rect test */
@@ -95 +99 @@
-        if (2*v > h) { y += h/2; h = 0; }
-        else {            y+=v; h-=2*v; }
+    }
+    void inflate(float v) {
+        inset(-v);
-    }
-

trunk/luigi/example1.d

@@ -140 +140 @@
-            auto b16 =   g.add_widget(new Button("Help"));
-
-
-
+
+
+
+
+
-                writefln(onoff?"checked!":"unchecked!"); 
-)
+
-        }
-
@@ -149 +152 @@
-            alias southGroup g; // workaround for http://tinyurl.com/u5eal
-            //Button b0 = add_widget(new Button("Hohoho!"));
-
-
-t1 = g.add_widget(new TextField("Last n
-t1.text = "Rumplestilskin"
+ 
+("Hello")
+l1 = g.add_widget(new Label( "Last N
+auto t1 = g.add_widget(new TextField("Rumpelstiltskin"))
-            auto b4 = g.add_widget(new Button("Click me!"));
-
+
+
+
-        }
-

trunk/luigi/gui.d

@@ -1503 +1503 @@
-
-
-
-
-
-
+
+
+
-        rect.width = 130;
-        text_accepted = new TextAcceptedSignal;
-
-
-
-
+
+
-
-    alias FlexSignal!(Widget, char[]) TextAcceptedSignal;

trunk/luigi/signalobj.d

@@ -149 +149 @@
-        return f_key;
-    }
+
+    /** Provides an alternate signal for connect() using the ~= operator.
+        This can allow for somewhat cleaner syntax when using delegate literals.
+        (One set of parentheses is eliminated)
+        For example:
+            theSignal ~= (Widget w, bool onoff) {
+                writefln(onoff?"checked!":"unchecked!");};
+        Versus 
+            theSignal.connect( (Widget w, bool onoff) {
+                writefln(onoff?"checked!":"unchecked!");});
+        The downside is that it is not possible to specify template
+        arguments for ~= explicitly if needed.
+     */
+    alias connect opCatAssign;
+
-    /** Some simple wrappers for the most comment skipped argument 
-
-
+
-     */
-    slot_key connect1st(DT)(DT f) { return connect!(DT,0)(f);  }
@@ -158 +172 @@
-    slot_key connect4th(DT)(DT f) { return connect!(DT,3)(f);  }
-    slot_key connect5th(DT)(DT f) { return connect!(DT,4)(f);  }
+
-    // this doesn't quite work yet because of DMD bug #540
-    // Name also has to be different from 'connect' for what also looks 
-    // to be a compiler bug.  They should be able to co-exist. 
+    // If it did work you'd be able to do something like sig.connecti!(2)(dg).
-    template connecti(int arg_offset) {
-        slot_key connecti(DT)(DT f)

trunk/luigi/theme.d

@@ -544 +544 @@
-        entry.y+=1;
-        entry.h-=2;
-        if (w.label) {
-            Rect text_rect = get_font.string_rect(w.label);
-            entry.x += 6+text_rect.w;
-            entry.w -= 6+text_rect.w;
-        }
-
-        txt = entry;
-        txt.inset(1); txt.w-=1; txt.h-=1;
@@ -577 +571 @@
-    Size textfield_min_size(Widget widget, Size bounds) {
-        auto w = cast(TextField)widget; assert(w);
-
-
-
+
-        return sz;
-    }
@@ -600 +592 @@
-            entry_rect.pos -= rect.pos;
-            inside_rect.pos -= rect.pos;
-            if (label) {
-                Rect text_rect = font.string_rect(label);
-                draw_label_text( label, 2-text_rect.x, 2-text_rect.y+text_rect.h );
-            }
-
-            set_color(hilite_color[2]);
@@ -716 +704 @@
-    void textfield_mouse_button(Widget widget, MouseButtonEvent ev)
-    {
-
+
+
-            auto txtf = cast(TextField)widget; assert(txtf);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }

trunk/luigi/themes/dxut.d

@@ -78 +78 @@
-        radiogroup_register();
-        radiobutton_register();
+
+        sel_text_color.set(255,255,255);
+        sel_text_bkg_color.set(10,36,106);
+        sel_text_unfocus_bkg_color.set(176,176,176);
+
-    }
-    ~this() {
@@ -87 +92 @@
-    class ThemeData {
-        // per-widget elements needed so we can blend objects independently
+        // a little wasteful, though, since most info does not change per-elem
-        Element[] elements;
-    }
@@ -151 +157 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    /** Draw text so the upper left corner is at (x,y) */
@@ -170 +178 @@
-        untranslate(trans);
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (elem.texColor.alpha == 0) 
-            return;
@@ -178 +219 @@
-        fill_rect(rect, elem.texRect);
-    }
-sprit
+textur
-        if (elem.texColor.alpha == 0) 
-            return;
@@ -185 +226 @@
-        fill_rect(rect, texRect);
-    }
-
+
+
-    {
-        if (elem.fontColor.alpha == 0)
@@ -193 +235 @@
-            set_color(0);
-            rect.x+=1; rect.y+=1;
-centered(elem.font, text, rect
+rect(elem.font, text, rect, al
-            rect.x-=1; rect.y-=1;
-        }
-        set_color(elem.fontColor.current);
-centered(elem.font, text, rect
+rect(elem.font, text, rect, al
-    }
-    //----LABEL---------------------------------------------------------------
-    void label_register() {
+        addHandlers!(Label)(&label_draw, &label_best_size);
+
+        Element[] elems = new Element[1];
+        Element e;
+        e.set_font( m_default_font );
+        e.fontColor.states[ WidgetState.Disabled ] = Color( 200, 200, 200, 200 );
+        elems[0] = e;
+        m_elements[Label.classinfo] = elems;
+    }
+    Size label_best_size(Widget widget, Size bounds) {
+        auto w = cast(Label)widget; assert(w);
+        Element[] elem = get_widget_elements(w);
+        Rect r = elem[0].font.string_rect(w.label);
+        return Size(r.width+2,r.height+2);
+    }
+    void label_draw(Widget widget) {
+        auto w = cast(Label)widget; assert(w);
+        WidgetState state = WidgetState.Normal;
+        if( !w.enabled)
+            state = WidgetState.Disabled;
+        Element[] elem = get_widget_elements(w);
+        elem[0].fontColor.blend( state, m_elapsedTime );
+        draw_elem_text( elem[0], w.label, w.rect, TextAlign.Center, true );
-    }
-
@@ -266 +331 @@
-            }
-
-            //float elapsedTime = 1.0/60.;
-
-            Element[] elem = get_widget_elements(w);
-
@@ -278 +341 @@
-                e.texColor.blend( iState, m_elapsedTime, blendRate);
-                e.fontColor.blend( iState, m_elapsedTime, blendRate);
-
-
-
-
-
-
-
-
-
-
+
+
-            }
-        }
@@ -359 +414 @@
-            txt_rect.w = elem[0].font.string_rect(label).w;
-            
-sprit
-
+textur
+TextAlign.Center, 
-
-            if( !checked )
@@ -367 +422 @@
-            elem[1].texColor.blend( iState, m_elapsedTime, fBlendRate );
-            btn_rect.inset(1);
-sprit
+textur
-        }
-    }
-    //----TEXTFIELD---------------------------------------------------------
+    enum TextElem {
+        Text,
+        TL, // top left
+        TC, // top center
+        TR, // top right
+        L,  // left
+        R,  // right
+        BL, // bottom left
+        BC, // bottom center
+        BR  // bottom right
+    }
-    void textfield_register() {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    //----SLIDER------------------------------------------------------------
-    void slider_register() {
@@ -380 +672 @@
-        Element[] elems = new Element[2];
-        Element e;
-
-
-        e.fontColor.states[ WidgetState.Rollover ] = Color(0, 0, 0, 255);
@@ -472 +763 @@
-            elem[0].texColor.blend( iState, m_elapsedTime, fBlendRate );
-            if (horizontal) {
-sprit
+textur
-            }
-            else {
@@ -482 +773 @@
-                glTranslatef(rect.x+rect.w/2, rect.y+rect.h/2, 0);
-                glRotatef(90,0,0,1);
-sprit
+textur
-                glPopMatrix();
-            }
@@ -506 +797 @@
-                thumb_rect.x = v-thumb_rect.w/2;
-                thumb_rect.y = track_rect.y + (track_rect.h-thumb_rect.h)/2;
-sprit
+textur
-            } else {
-                float t = (value-value_min)/(value_max-value_min);
@@ -515 +806 @@
-                glTranslatef(rect.x+rect.w/2, v, 0);
-                glRotatef(90,0,0,1);
-sprit
+textur
-                glPopMatrix();
-            }
@@ -578 +869 @@
-    int m_texh = 0;
-    Element[][ClassInfo] m_elements;
+
+    Color sel_text_color;
+    Color sel_text_bkg_color;
+    Color sel_text_unfocus_bkg_color;
-        
-    PerformanceCounter m_timer;
@@ -652 +947 @@
-
-    int[4] texRect;       // Bounding rect of this element on the composite texture
+    Rect elemRect;        // where this element will be drawn
-    
-    BlendColor texColor;