git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
712b1cb
)
honor horizontal alignment also when a mark is present
author
Felix Domke
<tmbinc@elitedvb.net>
Mon, 2 Oct 2006 23:47:53 +0000
(23:47 +0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Mon, 2 Oct 2006 23:47:53 +0000
(23:47 +0000)
lib/gui/elabel.cpp
patch
|
blob
|
history
diff --git
a/lib/gui/elabel.cpp
b/lib/gui/elabel.cpp
index 5c8e0b776cb4fd90d4596ae43487009bf561d135..f64adb2d79a7b74a6a912abe3ed30cad860870f1 100644
(file)
--- a/
lib/gui/elabel.cpp
+++ b/
lib/gui/elabel.cpp
@@
-37,7
+37,16
@@
int eLabel::event(int event, void *data, void *data2)
ePtr<eTextPara> para = new eTextPara(eRect(0, 0, size().width(), size().height()));
para->setFont(m_font);
para->renderString(m_text.empty()?0:m_text.c_str(), 0);
ePtr<eTextPara> para = new eTextPara(eRect(0, 0, size().width(), size().height()));
para->setFont(m_font);
para->renderString(m_text.empty()?0:m_text.c_str(), 0);
- para->realign(eTextPara::dirLeft);
+
+ 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))
int glyphs = para->size();
if ((m_pos < 0) || (m_pos >= glyphs))