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

Fix text rendering in rotated TextButtons

Browse source 
A vertically rotated text should be checked against the height of the
button, not the width of it.

Fixes #1119 ("Toolbar cannot display full text of workspace/​clock/​window
title.")
This commit is contained in:
Mathias Gumz 2015-01-24 10:31:38 +01:00
parent 67c31b49bd
commit 00cca1284f
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/FbTk/TextButton.cc
View file

@ -23,7 +23,6 @@
#include "TextUtils.hh"
#include "Font.hh"
#include "GContext.hh"
#include <cstdio>
namespace FbTk {
@ -123,21 +122,29 @@ void TextButton::drawText(int x_offset, int y_offset, FbDrawable *drawable) {
if (drawable == 0)
drawable = this;
const FbString& visual = text().visual();
unsigned int textlen = visual.size();
unsigned int button_width = width();
unsigned int button_height = height();
const int max_width = static_cast<int>(button_width) - x_offset -
m_left_padding - m_right_padding;
int padding = m_left_padding + m_right_padding;
if (max_width <= bevel()) {
int n_pixels = static_cast<int>(button_width) - x_offset;
if (m_orientation == ROT90 || m_orientation == ROT270) {
n_pixels = static_cast<int>(button_height) - y_offset;
}
n_pixels -= padding;
// text is to small to render
if (n_pixels <= bevel()) {
return;
}
translateSize(m_orientation, button_width, button_height);
// horizontal alignment, cut off text if needed
int align_x = FbTk::doAlignment(max_width,
int align_x = FbTk::doAlignment(n_pixels,
bevel(), justify(), font(),
visual.data(), visual.size(),
textlen); // return new text len