aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-09-12 23:35:31 (GMT)
committerfluxgen <fluxgen>2003-09-12 23:35:31 (GMT)
commit4a63da71684d0c4482c1eecc292cb56929894d62 (patch)
treeef256674741ced97ebc746f1828941d76fd08c5c
parent0246b8d413c39569baadd9e374d7840094b43e6c (diff)
downloadfluxbox_paul-4a63da71684d0c4482c1eecc292cb56929894d62.zip
fluxbox_paul-4a63da71684d0c4482c1eecc292cb56929894d62.tar.bz2
update for winFrameTheme on geom
-rw-r--r--src/Screen.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 5ce8c73..077ccfe 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.231 2003/09/08 16:37:27 fluxgen Exp $ 25// $Id: Screen.cc,v 1.232 2003/09/12 23:35:31 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -2047,8 +2047,8 @@ void BScreen::showPosition(int x, int y) {
2047 screenNumber(), 2047 screenNumber(),
2048 winFrameTheme().labelTextFocusGC(), 2048 winFrameTheme().labelTextFocusGC(),
2049 label, strlen(label), 2049 label, strlen(label),
2050 m_root_theme->bevelWidth(), 2050 winFrameTheme().bevelWidth(),
2051 m_root_theme->bevelWidth() + 2051 winFrameTheme().bevelWidth() +
2052 winFrameTheme().font().ascent()); 2052 winFrameTheme().font().ascent());
2053 2053
2054} 2054}
@@ -2084,8 +2084,8 @@ void BScreen::showGeometry(unsigned int gx, unsigned int gy) {
2084 screenNumber(), 2084 screenNumber(),
2085 winFrameTheme().labelTextFocusGC(), 2085 winFrameTheme().labelTextFocusGC(),
2086 label, strlen(label), 2086 label, strlen(label),
2087 m_root_theme->bevelWidth(), 2087 winFrameTheme().bevelWidth(),
2088 m_root_theme->bevelWidth() + 2088 winFrameTheme().bevelWidth() +
2089 winFrameTheme().font().ascent()); 2089 winFrameTheme().font().ascent());
2090} 2090}
2091 2091
@@ -2152,8 +2152,8 @@ void BScreen::renderGeomWindow() {
2152 "W: 0000 x H: 0000"); 2152 "W: 0000 x H: 0000");
2153 int l = strlen(s); 2153 int l = strlen(s);
2154 2154
2155 int geom_h = winFrameTheme().font().height() + m_root_theme->bevelWidth()*2; 2155 int geom_h = winFrameTheme().font().height() + winFrameTheme().bevelWidth()*2;
2156 int geom_w = winFrameTheme().font().textWidth(s, l) + m_root_theme->bevelWidth()*2; 2156 int geom_w = winFrameTheme().font().textWidth(s, l) + winFrameTheme().bevelWidth()*2;
2157 m_geom_window.resize(geom_w, geom_h); 2157 m_geom_window.resize(geom_w, geom_h);
2158 2158
2159 m_geom_window.setBorderWidth(winFrameTheme().border().width()); 2159 m_geom_window.setBorderWidth(winFrameTheme().border().width());