diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2012-10-02 12:24:47 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2012-10-03 08:27:16 (GMT) |
commit | 7b6ab828c7e5453a2720462156d165707935c9ef (patch) | |
tree | 3b641791b20b1994935e149fd7461decb11bef8c /src/Toolbar.cc | |
parent | 032a23d1e790c5224194562a837cc80fc157ce9b (diff) | |
download | fluxbox-7b6ab828c7e5453a2720462156d165707935c9ef.zip fluxbox-7b6ab828c7e5453a2720462156d165707935c9ef.tar.bz2 |
Improved vertical alignment of text in FbTk::TextButton
The old formula for vertical align text inside FbTk::TextButton ('height/2 +
font_ascent/2 - 1') produced not always good looking results, escpecially
when different fonts are involved (eg, ClockTool and WorkspaceName have
different fonts and font-sizes).
'(height - font_ascent) / 2 - 1' produces better results.
Additional changes:
* added ASCII-Art to document the involved entities when calculating the
baseline
* rewritten tests/testFont.cc to accept multiples texts and multiple
fonts
* removed some internal parts of FbTk::Font from the public interface
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r-- | src/Toolbar.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc index 1c22440..f46b9e9 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.cc | |||
@@ -170,14 +170,12 @@ Toolbar::Frame::Frame(FbTk::EventHandler &evh, int screen_num): | |||
170 | { | 170 | { |
171 | 171 | ||
172 | FbTk::EventManager &evm = *FbTk::EventManager::instance(); | 172 | FbTk::EventManager &evm = *FbTk::EventManager::instance(); |
173 | // add windows to eventmanager | ||
174 | evm.add(evh, window); | 173 | evm.add(evh, window); |
175 | 174 | ||
176 | } | 175 | } |
177 | 176 | ||
178 | Toolbar::Frame::~Frame() { | 177 | Toolbar::Frame::~Frame() { |
179 | FbTk::EventManager &evm = *FbTk::EventManager::instance(); | 178 | FbTk::EventManager &evm = *FbTk::EventManager::instance(); |
180 | // remove windows from eventmanager | ||
181 | evm.remove(window); | 179 | evm.remove(window); |
182 | } | 180 | } |
183 | 181 | ||