honor horizontal alignment also when a mark is present

[enigma2.git] / lib / gui / elabel.cpp

diff --git a/lib/gui/elabel.cpp b/lib/gui/elabel.cpp
index 970669c126b688bf70099979a6da40c864cfe0d1..f64adb2d79a7b74a6a912abe3ed30cad860870f1 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_have_shadow_color = 0;
 }
 
 int eLabel::event(int event, void *data, void *data2)
@@ -35,25 +36,40 @@ int eLabel::event(int event, void *data, void *data2)
                        style->setStyle(painter, eWindowStyle::styleLabel);
                        ePtr<eTextPara> para = new eTextPara(eRect(0, 0, size().width(), size().height()));
                        para->setFont(m_font);
-                       para->renderString(m_text, 0);
-                       para->realign(eTextPara::dirLeft);
+                       para->renderString(m_text.empty()?0:m_text.c_str(), 0);
 
-                       para->setGlyphFlag(m_pos, GS_INVERT);
-                       eRect bbox;
-                       bbox = para->getGlyphBBox(m_pos);
-                       printf("BBOX: %d %d %d %d\n", bbox.left(), 0, bbox.width(), size().height());
-                       bbox = eRect(bbox.left(), 0, bbox.width(), size().height());
-                       painter.fill(bbox);
+                       if (m_halign == alignLeft)
+                               para->realign(eTextPara::dirLeft);
+                       else if (m_halign == alignCenter)
+                               para->realign(eTextPara::dirCenter);
+                       else if (m_halign == alignRight)
+                               para->realign(eTextPara::dirRight);
+                       else if (m_halign == alignBlock)
+                               para->realign(eTextPara::dirBlock);
+
+                       int glyphs = para->size();
+
+                       if ((m_pos < 0) || (m_pos >= glyphs))
+                               eWarning("glyph index %d in eLabel out of bounds!", m_pos);
+                       else
+                       {
+                               para->setGlyphFlag(m_pos, GS_INVERT);
+                               eRect bbox;
+                               bbox = para->getGlyphBBox(m_pos);
+                               bbox = eRect(bbox.left(), 0, bbox.width(), size().height());
+                               painter.fill(bbox);
+                       }
 
                        painter.renderPara(para, ePoint(0, 0));
                        return 0;
-               }
-               else
-               {               
+               } else
+               {
                        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;
@@ -74,7 +90,19 @@ int eLabel::event(int event, void *data, void *data2)
                                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;
                }
@@ -129,13 +157,36 @@ void eLabel::setHAlign(int align)
 
 void eLabel::setForegroundColor(const gRGB &col)
 {
-       m_foreground_color = col;
-       m_have_foreground_color = 1;
+       if ((!m_have_foreground_color) || !(m_foreground_color == col))
+       {
+               m_foreground_color = col;
+               m_have_foreground_color = 1;
+               invalidate();
+       }
+}
+
+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()
 {
-       m_have_foreground_color = 0;
+       if (m_have_foreground_color)
+       {
+               m_have_foreground_color = 0;
+               invalidate();
+       }
 }
 
 eSize eLabel::calculateSize()
@@ -143,7 +194,7 @@ eSize eLabel::calculateSize()
        ePtr<eTextPara> p = new eTextPara(eRect(0, 0, size().width(), size().height()));
        
        p->setFont(m_font);
-       p->renderString(m_text, RS_WRAP);
+       p->renderString(m_text.empty()?0:m_text.c_str(), RS_WRAP);
        
        eRect bbox = p->getBoundBox();
        return bbox.size();