nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

using drawutil's doAligment function

Browse source
This commit is contained in:
fluxgen 2002-11-26 16:40:57 +00:00
parent 48f3316064
commit 75eb138d4e
1 changed files with 6 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/Tab.cc
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Tab.cc,v 1.42 2002/11/25 14:07:21 fluxgen Exp $ // $Id: Tab.cc,v 1.43 2002/11/26 16:40:57 fluxgen Exp $
#include "Tab.hh" #include "Tab.hh"
@ -367,43 +367,23 @@ void Tab::draw(bool pressed) const {
GC gc = ((m_win->isFocused()) ? m_win->getScreen()->getWindowStyle()->tab.l_text_focus_gc : GC gc = ((m_win->isFocused()) ? m_win->getScreen()->getWindowStyle()->tab.l_text_focus_gc :
m_win->getScreen()->getWindowStyle()->tab.l_text_unfocus_gc); m_win->getScreen()->getWindowStyle()->tab.l_text_unfocus_gc);
int dx=0;
Theme::WindowStyle *winstyle = m_win->getScreen()->getWindowStyle(); Theme::WindowStyle *winstyle = m_win->getScreen()->getWindowStyle();
size_t dlen = m_win->getTitle().size(); size_t dlen = m_win->getTitle().size();
size_t l = winstyle->tab.font.textWidth(m_win->getTitle().c_str(), dlen);
size_t max_width = m_size_w; // special cases in rotated mode size_t max_width = m_size_w; // special cases in rotated mode
if (winstyle->tab.font.isRotated()) if (winstyle->tab.font.isRotated())
max_width = m_size_h; max_width = m_size_h;
if ( l > m_size_w) { int dx = DrawUtil::doAlignment(max_width, m_win->frame.bevel_w,
for (; dlen >= 0; dlen--) { winstyle->tab.justify,
l = winstyle->tab.font.textWidth(m_win->getTitle().c_str(), dlen) + m_win->frame.bevel_w*4; winstyle->tab.font,
m_win->getTitle().c_str(), m_win->getTitle().size(), dlen);
if (l < max_width || dlen == 0)
break;
}
}
switch (winstyle->tab.justify) {
case DrawUtil::Font::RIGHT:
dx += max_width - l - m_win->frame.bevel_w*3;
break;
case DrawUtil::Font::CENTER:
dx += (max_width - l) / 2;
break;
case DrawUtil::Font::LEFT:
dx = m_win->frame.bevel_w;
break;
default:
break;
}
int dy = winstyle->tab.font.ascent() + m_win->frame.bevel_w; int dy = winstyle->tab.font.ascent() + m_win->frame.bevel_w;
// swap dx and dy if we're rotated // swap dx and dy if we're rotated
if (winstyle->tab.font.isRotated()) { if (winstyle->tab.font.isRotated()) {
int tmp = dy; int tmp = dy;
dy = m_size_h - dx; // upside down dy = m_size_h - dx; // upside down (reverse direction)
dx = tmp; dx = tmp;
} }