Changeset 66

Timestamp:

06/29/08 12:32:16 (2 months ago)

Author:

kaarna

Message:

textWidth in Label. followsChildWidth. Menu is better.

Files:

• trunk/pihlaja/src/shiraz/Shiraz.d (modified) (1 diff)
• trunk/pihlaja/src/shiraz/canvas/Draw.d (modified) (3 diffs)
• trunk/pihlaja/src/shiraz/canvas/Image.d (modified) (3 diffs)
• trunk/pihlaja/src/shiraz/canvas/Rectangle.d (modified) (6 diffs)
• trunk/pihlaja/src/shiraz/ui/Button.d (modified) (2 diffs)
• trunk/pihlaja/src/shiraz/ui/Label.d (modified) (3 diffs)
• trunk/pihlaja/src/shiraz/ui/Paned.d (modified) (1 diff)
• trunk/pihlaja/src/shiraz/ui/SubWindow.d (modified) (4 diffs)
• trunk/pihlaja/src/shiraz/ui/Window.d (modified) (1 diff)

trunk/pihlaja/src/shiraz/Shiraz.d

@@ -59 +59 @@
-    float tempparam1 = 53.1f;
-
-
+
+
+
+
+
-    float pixel() { return 1.0f/screenHeightP; }
-    //This returns and accepts Height coordinates

trunk/pihlaja/src/shiraz/canvas/Draw.d

@@ -385 +385 @@
-}
-
-
+, out float get_text_width, out float get_text_height
-{
-    cairo_format_t form = cairo_format_t.ARGB32;
@@ -416 +416 @@
-   */
-    
-
-//
+   //
+
-  //font_options.setHintStyle(cairo_hint_style_t.SLIGHT);
-    //font_options.setHintStyle(cairo_hint_style_t.MEDIUM);
-    //font_options.setHintStyle(cairo_hint_style_t.FULL);
-    
-
-//
+//
+
-    //font_options.setHintMetrics(cairo_hint_metrics_t.ON);
-
-
-//
+//
+
-    //font_options.setAntialias(cairo_antialias_t.NONE);
-    //font_options.setAntialias(cairo_antialias_t.SUBPIXEL);
@@ -464 +464 @@
-            //double x = wid-((extents.width/2.0) + extents.xBearing);
-            //double y = hei-((extents.height/2.0) + extents.yBearing);
+            
+            //TODO What about + or - xBearing here??
+            get_text_width = extents.width;
+            get_text_height = extents.height;
-            
-            double x = (wid/2.0)-((extents.width/2.0) + extents.xBearing);

trunk/pihlaja/src/shiraz/canvas/Image.d

@@ -675 +675 @@
-    }
-    
-
+, out float get_text_width, out float get_text_height
-    {
-        Image img = new Image();
@@ -681 +681 @@
-        //img.magFilter = GL_NEAREST;
-        //img.minFilter = GL_NEAREST;
-
+, get_text_width, get_text_height 
-        
-        return img;
-    }
-    
-
+, out float get_text_width, out float get_text_height
-    {
-        width = 128;
@@ -692 +692 @@
-        channels = 4;
-        scope GLubyte[] image = new GLubyte[(width*height)*channels];
-
+, get_text_width, get_text_height
-        createTextureFromData( image, width, height, channels );
-    }

trunk/pihlaja/src/shiraz/canvas/Rectangle.d

@@ -2774 +2774 @@
-    //float border = 0.002f;
-    //float padding = 0.005f;
+    
+    //TODO use:
+    float inPadding = 0.0f;
+    //float outPadding = 0.0f;
-    float padding = 0.0f;
-    
+    //TODO: Anchor NOT USED AT THE MOMENT:
+    /*
-    public void anchor() { return m_anchor; }
-    public void anchor(Anchor set) { return m_anchor = set; }
-    protected Anchor m_anchor = Anchor.TOP_LEFT;
+    */
-    
-    /*
@@ -2813 +2820 @@
-    public ArrangeType arrangeType(ArrangeType set) { return m_arrangeType = set; }
-    protected ArrangeType m_arrangeType = ArrangeType.VBOX;
+    
+    bool followsChildWidth = false;
+    bool followsChildHeight = false;
-    
-    /*
@@ -2971 +2981 @@
-        if( result == 0.0f )
-            return minWidth;//This propably makes no sense, but
+            //currently it should work. As minHeight is set for
+            //all Widgets.
+            
+        return result;
+    }
+    
+    float childrenDefaultHeight()
+    {
+        float result = 0.0f;
+        
+        switch( arrangeType )
+        {
+            default:
+            case ArrangeType.FREE:
+                
+            break;
+            case ArrangeType.LAYER:
+            
+            break;
+            case ArrangeType.HBOX:
+                foreach( Rectangle wid; itemList )
+                {
+                    //debug(arrange) Trace.formatln("wid.name: {} height: {}", wid.name, cast(double) wid.h );
+                    if( result < (wid.ifDefaultHeight + wid.padding*2.0f) )
+                        result = (wid.ifDefaultHeight + wid.padding*2.0f);
+                }
+            break;
+            case ArrangeType.VBOX:
+                foreach( Rectangle wid; itemList )
+                {
+                    result = result + (wid.ifDefaultHeight + wid.padding*2.0f);
+                }
+            break;
+        }
+        
+        if( result == 0.0f )
+            return ifDefaultHeight;//This propably makes no sense, but
+            //currently it should work. As minHeight is set for
+            //all Widgets.
+            
+        return result;
+    }
+    
+    float childrenDefaultWidth()
+    {
+        float result = 0.0f;
+        
+        switch( arrangeType )
+        {
+            default:
+            case ArrangeType.FREE:
+                
+            break;
+            case ArrangeType.LAYER:
+            
+            break;
+            case ArrangeType.HBOX:
+                foreach( Rectangle wid; itemList )
+                {
+                    result = result + (wid.ifDefaultWidth + wid.padding*2.0f);
+                }
+            break;
+            case ArrangeType.VBOX:
+                foreach( Rectangle wid; itemList )
+                {
+                    //Trace.formatln("wid.name: {} height: {}", wid.name, cast(double) wid.h );
+                    if( result < (wid.ifDefaultWidth + wid.padding*2.0f) )
+                        result = (wid.ifDefaultWidth + wid.padding*2.0f);
+                }
+            break;
+        }
+        
+        if( result == 0.0f )
+            return ifDefaultWidth;//This propably makes no sense, but
-            //currently it should work. As minHeight is set for
-            //all Widgets.
@@ -3489 +3573 @@
-        }
-        
-
+
+
+
+
+
+
+
+
+
-        
-        
@@ -3704 +3796 @@
-        return m_defaultWidth;
-    }
+    public float defaultWidthN(float set)
+    {
+        hasDefaultWidth = true;
+        m_defaultWidth = set;
+        if( m_minWidth > m_defaultWidth )
+            m_minWidth = m_defaultWidth;
+        if( m_maxWidth < m_defaultWidth )
+            m_maxWidth = m_defaultWidth;
+            
+        wN(defaultWidth);//was wc()
+        
+        //arrange();
+        return m_defaultWidth;
+    }
-    protected float m_defaultWidth = 1.0f;
-    
@@ -3743 +3849 @@
-        return m_defaultHeight;
-    }
+    public float defaultHeightN(float set)
+    {
+        hasDefaultHeight = true;
+        m_defaultHeight = set;
+        if( m_minHeight > m_defaultHeight )
+            m_minHeight = m_defaultHeight;
+        if( m_maxHeight < m_defaultHeight )
+            m_maxHeight = m_defaultHeight;
+            
+        hN(defaultHeight);//was hc()
+        
+        //arrange();
+        return m_defaultHeight;
+    }
-    protected float m_defaultHeight = 1.0f;
-    

trunk/pihlaja/src/shiraz/ui/Button.d

@@ -74 +74 @@
-        //set( 0.0f, 0.0f, 0.6f, 0.2f );
-        
+        inPadding = 0.015f;
-        padding = 0.005f;
-//
+
-        yPackOptions = PackOptions.SHRINK;
-        defaultHeight = 0.04;
@@ -85 +86 @@
-        label.colour(1.0, 1.0, 1.0, 1.0);//White
-        label.xPackOptions = PackOptions.EXPAND;
+
+        //Now that we have the label set up, it knows it's
+        //width, and we can use it to set our defaultWidth.
+        //using padding here is just funny. We should really have
+        //a system with inPadding and outPadding.
+        defaultWidth = label.textWidth + (padding * 6.0f);
+        followsChildWidth = true;
+        
-        add(label);
-
+
-        signalMouseButtonPress.attach(&buttonHandler);
-        signalMouseButtonRelease.attach(&buttonHandler);

trunk/pihlaja/src/shiraz/ui/Label.d

@@ -59 +59 @@
-        //set( 0.0f, 0.0f, 0.6f, 0.2f );
-        
-
+
+
+
+
+
+
+
+
+
+
+
-        
-        padding = 0.0f;
@@ -71 +81 @@
-        
-    }
+    
+    float textWidth = 0.0f;
+    float textHeight = 0.0f;
-    
-    /+public Widget root(Widget set)///Don't use this yourself.
@@ -216 +229 @@
-        r = sr; g = sg; b = sb; a = sa;
-        if( texture !is null )
-
+
+
+
+
+
+
+
-    }
-    

trunk/pihlaja/src/shiraz/ui/Paned.d

@@ -75 +75 @@
-        
-        //rectangle.
-
+
+
-        //rectangle.
-        //set( 0.0f, 0.0f, 0.6f, 0.2f );
-        
-
+//
-        
-        padding = 0.000f;

trunk/pihlaja/src/shiraz/ui/SubWindow.d

@@ -1569 +1569 @@
-        isOutline = false;
-        
+        xPackOptions = PackOptions.SHRINK;
+        yPackOptions = PackOptions.SHRINK;
+        
+        inPadding = 0.015f;
-        padding = 0.0f;
-        
-        texture = null;
+        
+        /*
+        menuButton = new Button(set_name);
+        menuButton.texture = null;
+        menuButton.padding = 0.0f;
+        add(menuButton);
+        */
+        
+        //keyShortCutLabel = new Label("Key");
+        //add(keyShortCutLabel);
-        
-    }
@@ -1599 +1613 @@
-    void arrange()
-    {
+        super.arrange();
+        
-        if( menuWindow !is null )
-        {
-) + (menuWindow.h*0.5
-
+f) + (menuWindow.h*0.5f
+ + (menuWindow.w*0.5f) - (w*0.5f)
-        }
-    }
@@ -1635 +1651 @@
-    }
-    
+    //Button menuButton;
+    Label keyShortCutLabel;
-    MenuWindow menuWindow;
-}
@@ -1647 +1665 @@
-    
-        super("MenuWindow", WindowHeaderType.NONE, WindowHeaderType.NONE );
+        
+        followsChildWidth = true;
+        followsChildHeight = true;
-        
-        

trunk/pihlaja/src/shiraz/ui/Window.d

@@ -1059 +1059 @@
-        
-        gtkWindow.setSizeRequest( cast(int)set_width, cast(int)set_height );
+        //Doesn't work?:
+        //gtkWindow.setDefaultSize( cast(int)set_width, cast(int)set_height );
-    }
-