diff options
author | Thomas Lübking <thomas.luebking@gmail.com> | 2016-04-11 21:57:18 (GMT) |
---|---|---|
committer | Mathias Gumz <akira@fluxbox.org> | 2016-07-01 18:14:04 (GMT) |
commit | ca452a58867b4ceaacb35c823902c89f2f6b6b83 (patch) | |
tree | 57ae780edf7026a50fbd61e4201b1fbe2b70db62 /src/FbTk/MenuTheme.hh | |
parent | ea306493f95abd04cfa5b7653e3ad30a74b1985f (diff) | |
download | fluxbox-ca452a58867b4ceaacb35c823902c89f2f6b6b83.zip fluxbox-ca452a58867b4ceaacb35c823902c89f2f6b6b83.tar.bz2 |
ignore font for empty title height calculation
and align calculation on init and reconfigure
As a result, if a menu has no label, the title height is determined
only by menu.titleHeight (and the border sizes), not by the unused font.
Diffstat (limited to 'src/FbTk/MenuTheme.hh')
-rw-r--r-- | src/FbTk/MenuTheme.hh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/FbTk/MenuTheme.hh b/src/FbTk/MenuTheme.hh index e217e7c..b03b6fc 100644 --- a/src/FbTk/MenuTheme.hh +++ b/src/FbTk/MenuTheme.hh | |||
@@ -104,7 +104,9 @@ public: | |||
104 | BulletType bullet() const { return *m_bullet; } | 104 | BulletType bullet() const { return *m_bullet; } |
105 | Justify bulletPos() const { return *bullet_pos; } | 105 | Justify bulletPos() const { return *bullet_pos; } |
106 | 106 | ||
107 | unsigned int titleHeight() const { return m_real_title_height; } | 107 | unsigned int titleHeight(bool fontConstrained = false) const { |
108 | return fontConstrained ? m_real_title_height : *m_title_height; | ||
109 | } | ||
108 | unsigned int itemHeight() const { return m_real_item_height; } | 110 | unsigned int itemHeight() const { return m_real_item_height; } |
109 | unsigned int borderWidth() const { return *m_border_width; } | 111 | unsigned int borderWidth() const { return *m_border_width; } |
110 | unsigned int bevelWidth() const { return *m_bevel_width; } | 112 | unsigned int bevelWidth() const { return *m_bevel_width; } |