add (simple) shadow for eLabel

diff --git a/lib/gui/elabel.cpp b/lib/gui/elabel.cpp
index 018ce95b521cfe2b342eefa3c94b146a486f3e08..591b725a809fd0b95083b7057265240119868bd7 100644 (file)
--- a/lib/gui/elabel.cpp
+++ b/lib/gui/elabel.cpp
@@ -14,6 +14,7 @@ eLabel::eLabel(eWidget *parent, int markedPos): eWidget(parent)
        m_halign = alignLeft;
        
        m_have_foreground_color = 0;
        m_halign = alignLeft;
        
        m_have_foreground_color = 0;

+       m_have_shadow_color = 0;

 }
 
 int eLabel::event(int event, void *data, void *data2)
 }
 
 int eLabel::event(int event, void *data, void *data2)


@@ -52,13 +53,14 @@ int eLabel::event(int event, void *data, void *data2)
 
                        painter.renderPara(para, ePoint(0, 0));
                        return 0;
 
                        painter.renderPara(para, ePoint(0, 0));
                        return 0;

-               }
-               else
-               {               
+               } else
+               {

                        painter.setFont(m_font);
                        style->setStyle(painter, eWindowStyle::styleLabel);
                        
                        painter.setFont(m_font);
                        style->setStyle(painter, eWindowStyle::styleLabel);
                        

-                       if (m_have_foreground_color)
+                       if (m_have_shadow_color)
+                               painter.setForegroundColor(m_shadow_color);
+                       else if (m_have_foreground_color)

                                painter.setForegroundColor(m_foreground_color);
                        
                        int flags = 0;
                                painter.setForegroundColor(m_foreground_color);
                        
                        int flags = 0;


@@ -79,7 +81,19 @@ int eLabel::event(int event, void *data, void *data2)
                                flags |= gPainter::RT_HALIGN_BLOCK;
                        
                        flags |= gPainter::RT_WRAP;
                                flags |= gPainter::RT_HALIGN_BLOCK;
                        
                        flags |= gPainter::RT_WRAP;

-                       painter.renderText(eRect(0, 0, size().width(), size().height()), m_text, flags);
+                       
+                               /* if we don't have shadow, m_shadow_offset will be 0,0 */
+                       painter.renderText(eRect(-m_shadow_offset.x(), -m_shadow_offset.y(), size().width(), size().height()), m_text, flags);
+                       
+                       if (m_have_shadow_color)
+                       {
+                               if (!m_have_foreground_color)
+                                       style->setStyle(painter, eWindowStyle::styleLabel);
+                               else
+                                       painter.setForegroundColor(m_foreground_color);
+                               painter.setBackgroundColor(m_shadow_color);
+                               painter.renderText(eRect(0, 0, size().width(), size().height()), m_text, flags);
+                       }

                        
                        return 0;
                }
                        
                        return 0;
                }


@@ -142,6 +156,21 @@ void eLabel::setForegroundColor(const gRGB &col)
        }
 }
 
        }
 }
 

+void eLabel::setShadowColor(const gRGB &col)
+{
+       if ((!m_have_shadow_color) || !(m_shadow_color == col))
+       {
+               m_shadow_color = col;
+               m_have_shadow_color = 1;
+               invalidate();
+       }
+}
+
+void eLabel::setShadowOffset(const ePoint &offset)
+{
+       m_shadow_offset = offset;
+}
+

 void eLabel::clearForegroundColor()
 {
        if (m_have_foreground_color)
 void eLabel::clearForegroundColor()
 {
        if (m_have_foreground_color)

diff --git a/lib/gui/elabel.h b/lib/gui/elabel.h
index df57e7b597e3e11fff73724d5081bd5416661aee..471a4eec49a3de757f3ed0bf9909984c04d82d40 100644 (file)
--- a/lib/gui/elabel.h
+++ b/lib/gui/elabel.h
@@ -26,6 +26,8 @@ public:
        void setHAlign(int align);
        
        void setForegroundColor(const gRGB &col);
        void setHAlign(int align);
        
        void setForegroundColor(const gRGB &col);

+       void setShadowColor(const gRGB &col);
+       void setShadowOffset(const ePoint &offset);

        void clearForegroundColor();
        
        eSize calculateSize();
        void clearForegroundColor();
        
        eSize calculateSize();


@@ -36,8 +38,9 @@ protected:
        int event(int event, void *data=0, void *data2=0);
        int m_pos;
 private:
        int event(int event, void *data=0, void *data2=0);
        int m_pos;
 private:

-       int m_have_foreground_color;
-       gRGB m_foreground_color;
+       int m_have_foreground_color, m_have_shadow_color;
+       gRGB m_foreground_color, m_shadow_color;
+       ePoint m_shadow_offset;

        
        enum eLabelEvent
        {
        
        enum eLabelEvent
        {