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

cosmetic

Browse source
This commit is contained in:
akir 2004-09-01 08:00:24 +00:00
parent b12ce691bc
commit 0fbb0bfe8b
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/FbTk/MenuItem.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: MenuItem.cc,v 1.7 2004/09/01 07:53:45 akir Exp $ // $Id: MenuItem.cc,v 1.8 2004/09/01 08:00:24 akir Exp $
#include "MenuItem.hh" #include "MenuItem.hh"
#include "Command.hh" #include "Command.hh"
@ -243,12 +243,11 @@ unsigned int MenuItem::height(const MenuTheme &theme) const {
unsigned int MenuItem::width(const MenuTheme &theme) const { unsigned int MenuItem::width(const MenuTheme &theme) const {
// textwidth + bevel width on each side of the text // textwidth + bevel width on each side of the text
int normal = theme.frameFont().textWidth(label().c_str(), label().size()) + 2*(theme.bevelWidth() + height(theme)); const unsigned int icon_width = height(theme);
if (m_icon.get() == 0) const unsigned int normal = theme.frameFont().textWidth(label().c_str(), label().size()) +
return normal; 2 * (theme.bevelWidth() + icon_width);
else
return normal + height(theme);
return m_icon.get() == 0 ? normal : normal + icon_width;
} }
void MenuItem::updateTheme(const MenuTheme &theme) { void MenuItem::updateTheme(const MenuTheme &theme) {