git.cweiske.de / enigma2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix
[enigma2.git] / lib / gui / elabel.cpp
diff --git a/lib/gui/elabel.cpp b/lib/gui/elabel.cpp
index ce4efaf17f02b505bbb3c76e4d2fb504d11695de..17239fbcb46a9f3b98412d32c8ff1d490fc4d6fe 100644 (file)
--- a/lib/gui/elabel.cpp
+++ b/lib/gui/elabel.cpp
@@ -1,253 +1,120 @@
 #include <lib/gui/elabel.h>
 #include <lib/gui/elabel.h>
-
-#include <lib/gdi/fb.h>
 #include <lib/gdi/font.h>
 #include <lib/gdi/font.h>
-#include <lib/gdi/lcd.h>
-#include <lib/gui/eskin.h>
-#include <lib/base/init.h>
-#include <lib/base/init_num.h>
 
 
-eLabel::eLabel(eWidget *parent, int flags, int takefocus, const char *deco ):
-       eDecoWidget(parent, takefocus, deco), blitFlags(0), flags(flags),
-       para(0), align( eTextPara::dirLeft ), shortcutPixmap(0)
+eLabel::eLabel(eWidget *parent): eWidget(parent)
 {
 {
+       ePtr<eWindowStyle> style;
+       getStyle(style);
+       
+       style->getFont(eWindowStyle::fontStatic, m_font);
+       
+               /* default to topleft alignment */
+       m_valign = alignTop;
+       m_halign = alignLeft;
+       
+       m_have_foreground_color = 0;
 }
 
 }
 
-eLabel::~eLabel()
+int eLabel::event(int event, void *data, void *data2)
 {
 {
-       if (para)
+       switch (event)
        {
        {
-               para->destroy();
-               para=0;
-       }
-}
-
-void eLabel::setPixmapPosition( const ePoint &p )
-{
-       pixmap_position = p;
-       invalidate();
-}
-
-void eLabel::validate( const eSize* s )
-{
-       if (!para)
+       case evtPaint:
        {
        {
-               if (s)
-                       para=new eTextPara( eRect(text_position.x(), text_position.y(), s->width() - text_position.x(), s->height() - text_position.y()));
-               else
-                       para=new eTextPara( eRect(text_position.x(), text_position.y(), size.width() - text_position.x(), size.height() - text_position.y()));
-
-               para->setFont(font);
-               para->renderString(text, flags);
-               para->realign(align);
-  }
-}
-
-void eLabel::invalidate()
-{
-       if (para)
-       {
-               para->destroy();
-               para=0;
+               ePtr<eWindowStyle> style;
+               
+               getStyle(style);
+               
+               eWidget::event(event, data, data2);
+
+               gPainter &painter = *(gPainter*)data2;
+               painter.setFont(m_font);
+               style->setStyle(painter, eWindowStyle::styleLabel);
+               
+               if (m_have_foreground_color)
+                       painter.setForegroundColor(m_foreground_color);
+               
+               int flags = 0;
+               if (m_valign == alignTop)
+                       flags |= gPainter::RT_VALIGN_TOP;
+               else if (m_valign == alignCenter)
+                       flags |= gPainter::RT_VALIGN_CENTER;
+               else if (m_valign == alignBottom)
+                       flags |= gPainter::RT_VALIGN_BOTTOM;
+
+               if (m_halign == alignLeft)
+                       flags |= gPainter::RT_HALIGN_LEFT;
+               else if (m_halign == alignCenter)
+                       flags |= gPainter::RT_HALIGN_CENTER;
+               else if (m_halign == alignRight)
+                       flags |= gPainter::RT_HALIGN_RIGHT;
+               else if (m_halign == alignBlock)
+                       flags |= gPainter::RT_HALIGN_BLOCK;
+               
+               flags |= gPainter::RT_WRAP;
+               painter.renderText(eRect(0, 0, size().width(), size().height()), m_text, flags);
+               
+               return 0;
        }
        }
-       if (isVisible())
-               eDecoWidget::invalidate();  // we must redraw...
-}
-
-void eLabel::setFlags(int flag)
-{
-       flags|=flag;
-       if (flag)
+       case evtChangedFont:
+       case evtChangedText:
+       case evtChangedAlignment:
                invalidate();
                invalidate();
+               return 0;
+       default:
+               return eWidget::event(event, data, data2);
+       }
 }
 
 }
 
-void eLabel::setBlitFlags( int flags )
+void eLabel::setText(const std::string &string)
 {
 {
-       blitFlags |= flags;
+       if (m_text == string)
+               return;
+       m_text = string;
+       event(evtChangedText);
 }
 
 }
 
-void eLabel::removeFlags(int flag)
+void eLabel::setFont(gFont *font)
 {
 {
-       flags &= ~flag;
-       if (flag)
-               invalidate();
+       m_font = font;
+       event(evtChangedFont);
 }
 
 }
 
-void eLabel::setAlign(int align)
+gFont* eLabel::getFont()
 {
 {
-       this->align = align;
-       invalidate();
+       return m_font;
 }
 
 }
 
-void eLabel::redrawWidget(gPainter *target, const eRect &rc)
+void eLabel::setVAlign(int align)
 {
 {
-/*     eDebug("decoStr = %s, text=%s, name=%s, %p left = %d, top = %d, width=%d, height = %d", strDeco?strDeco.c_str():"no", text?text.c_str():"no" , name?name.c_str():"no", this, this->getPosition().x(), this->getPosition().y(), this->getSize().width(), this->getSize().height() ); 
-       eDebug("renderContext left = %d, top = %d, width = %d, height = %d", rc.left(), rc.top(), rc.width(), rc.height() );*/
-
-       target->clip( gRegion(rc) );
-       eRect area=eRect(ePoint(0, 0), ePoint(width(), height()));
-/*     eDebug("area left = %d, top = %d, width = %d, height = %d",
-               area.left(), area.top(),
-               area.width(), area.height() );*/
-
-       if (deco_selected && have_focus)
-       {
-               deco_selected.drawDecoration(target, ePoint(width(), height()));
-               area=crect_selected;
-       } else if (deco)
-       {
-               deco.drawDecoration(target, ePoint(width(), height()));
-               area=crect;
-       }
-/*     eDebug("area left = %d, top = %d, width = %d, height = %d",
-               area.left(), area.top(),
-               area.width(), area.height() );*/
-
-       if (shortcutPixmap)
-       {
-               //area.setWidth(area.width()-area.height());
-               area.setX(area.height());
-       }
-
-       if (text.length())
-       {
-               if ( area.size().height() < size.height() ||
-                               area.size().width() < size.width() )
-               {
-               // then deco is drawed
-                       eSize s=area.size();
-                       validate( &s );
-               } else
-                       validate();
-
-               if (flags & flagVCenter)
-                       yOffs = ( (area.height() - para->getBoundBox().height() ) / 2 + 0) - para->getBoundBox().top();
-               else
-                       yOffs = 0;
-
-               eWidget *w;
-               if ((blitFlags & BF_ALPHATEST) && (transparentBackgroundColor >= 0))
-               {
-                       w=this;
-                       target->setBackgroundColor(transparentBackgroundColor);
-               } else
-               {
-                       w=getNonTransparentBackground();
-                       target->setBackgroundColor(w->getBackgroundColor());
-               }
-               target->setFont(font);
-               target->renderPara(para, ePoint( area.left(), area.top()+yOffs) );
-       }
-       if (pixmap)
-       {
-//             eDebug("blit pixmap area left=%d, top=%d, right=%d, bottom=%d", rc.left(), rc.top(), rc.right(), rc.bottom() );
-//             eDebug("pixmap_pos x = %d, y = %d, xsize=%d, ysize=%d", pixmap_position.x(), pixmap_position.y(), pixmap->x, pixmap->y );
-               target->blit(pixmap, shortcutPixmap?pixmap_position+ePoint( area.left(), 0):pixmap_position, area, (blitFlags & BF_ALPHATEST) ? gPixmap::blitAlphaTest : 0);
-       }
-       if (shortcutPixmap)
-               target->blit(shortcutPixmap, 
-                               ePoint((area.height()-shortcutPixmap->getSize().width())/2, area.top()+(area.height()-shortcutPixmap->getSize().height())/2),
-                               eRect(),
-                               gPixmap::blitAlphaTest);
-       target->clippop();
-}
-
-int eLabel::eventHandler(const eWidgetEvent &event)
-{
-       switch (event.type)
-       {
-               case eWidgetEvent::changedFont:
-               case eWidgetEvent::changedText:
-               if (para)
-               {
-                       para->destroy();
-                       para=0;
-               }
-               if ( have_focus && deco_selected )
-                       eDecoWidget::invalidate( crect_selected );
-               else if ( deco )
-                       eDecoWidget::invalidate( crect );
-               else
-                       eDecoWidget::invalidate();
-       break;
-
-       case eWidgetEvent::changedSize:
-               invalidate();
-       break;
-
-       default:
-               return eDecoWidget::eventHandler(event);
-               break;
-       }
-       return 1;
+       m_valign = align;
+       event(evtChangedAlignment);
 }
 
 }
 
-eSize eLabel::getExtend()
+void eLabel::setHAlign(int align)
 {
 {
-       validate();
-       return eSize(para->getBoundBox().width()+(shortcutPixmap?shortcutPixmap->x*2:0), para->getBoundBox().height());
+       m_halign = align;
+       event(evtChangedAlignment);
 }
 
 }
 
-ePoint eLabel::getLeftTop()
+void eLabel::setForegroundColor(const gRGB &col)
 {
 {
-       validate();
-       return ePoint(para->getBoundBox().left(), para->getBoundBox().top());
+       m_foreground_color = col;
+       m_have_foreground_color = 1;
 }
 
 }
 
-int eLabel::setProperty(const eString &prop, const eString &value)
+void eLabel::clearForegroundColor()
 {
 {
-       if (prop=="wrap" && value == "on")
-               setFlags(RS_WRAP);
-       else if (prop=="alphatest" && value == "on")
-       {
-               transparentBackgroundColor=getBackgroundColor();
-               setBackgroundColor(-1);
-               blitFlags |= BF_ALPHATEST;
-       } else if (prop=="align")
-       {
-               if (value=="left")
-                       setAlign(eTextPara::dirLeft);
-               else if (value=="center")
-                       setAlign(eTextPara::dirCenter);
-               else if (value=="right")
-                       setAlign(eTextPara::dirRight);
-               else if (value=="block")
-                       setAlign(eTextPara::dirBlock);
-               else
-                       setAlign(eTextPara::dirLeft);
-       }
-       else if (prop=="vcenter")
-               setFlags( flagVCenter );
-       else if (prop == "shortcut")
-       {
-               setShortcutPixmap(value);
-               return eWidget::setProperty(prop, value);
-       } else
-               return eDecoWidget::setProperty(prop, value);
-       return 0;
-}
-
-void eLabel::setShortcutPixmap(const eString &shortcut)
-{
-       eSkin::getActive()->queryImage(shortcutPixmap, "shortcut." + shortcut);
+       m_have_foreground_color = 0;
 }
 
 }
 
-static eWidget *create_eLabel(eWidget *parent)
+eSize eLabel::calculateSize()
 {
 {
-       return new eLabel(parent);
+       ePtr<eTextPara> p = new eTextPara(eRect(0, 0, size().width(), size().height()));
+       
+       p->setFont(m_font);
+       p->renderString(m_text, RS_WRAP);
+       
+       eRect bbox = p->getBoundBox();
+       return bbox.size();
 }
 }
-
-class eLabelSkinInit
-{
-public:
-       eLabelSkinInit()
-       {
-               eSkin::addWidgetCreator("eLabel", create_eLabel);
-       }
-       ~eLabelSkinInit()
-       {
-               eSkin::removeWidgetCreator("eLabel", create_eLabel);
-       }
-};
-
-eAutoInitP0<eLabelSkinInit> init_eLabelSkinInit(eAutoInitNumbers::guiobject, "eLabel");
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources