From: Dana Jansens <danakj@orodu.net>
Date: Sat, 6 Sep 2003 08:43:30 +0000 (+0000)
Subject: add the margins to the label_height so that the text doesnt cover the bevel/border
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=a1184b2b7707a9d5c7e6680a6730a6d629e9fa03;p=chaz%2Fopenbox

add the margins to the label_height so that the text doesnt cover the bevel/border
---

diff --git a/render/theme.c b/render/theme.c
index 934750dd..46636e2b 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -878,7 +878,15 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
 
     XrmDestroyDatabase(db);
 
-    theme->label_height = theme->winfont_height;
+    {
+        gint fl, ft, fr, fb;
+        gint ul, ut, ur, ub;
+
+        RrMargins(theme->a_focused_label, &fl, &ft, &fr, &fb);
+        RrMargins(theme->a_unfocused_label, &ul, &ut, &ur, &ub);
+        theme->label_height = theme->winfont_height
+            + MAX(ft + fb, ut + ub);
+    }
     theme->title_height = theme->label_height + theme->bevel * 2;
     theme->button_size = theme->label_height - 2;
     theme->grip_width = theme->title_height * 1.5;