X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FScreen.cc;h=7438a9d84abbc70b7ae66276cd859ee4fd00bdcb;hb=44e3582d5e08556c7b1136cfd9a49546cf5fcae0;hp=65264e36bf522ac2fa1010e49f6bd023bc5a8a97;hpb=ffce7be32582e3e93ca4d18c751f5c4e250a661e;p=chaz%2Fopenbox

diff --git a/src/Screen.cc b/src/Screen.cc
index 65264e36..7438a9d8 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -32,7 +32,6 @@
 
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
-#include <assert.h>
 
 #include "i18n.h"
 #include "openbox.h"
@@ -1253,7 +1252,7 @@ void BScreen::LoadStyle(void) {
 
   // load bevel, border and handle widths
   if (conf.getValue("handleWidth", "HandleWidth", l)) {
-    if (l <= getWidth() / 2 && l != 0)
+    if (l <= size().w() / 2 && l != 0)
       resource.handle_width = l;
     else
       resource.handle_width = 6;
@@ -1266,7 +1265,7 @@ void BScreen::LoadStyle(void) {
     resource.border_width = 1;
 
   if (conf.getValue("bevelWidth", "BevelWidth", l)) {
-    if (l <= getWidth() / 2 && l != 0)
+    if (l <= size().w() / 2 && l != 0)
       resource.bevel_width = l;
     else
       resource.bevel_width = 3;
@@ -1274,7 +1273,7 @@ void BScreen::LoadStyle(void) {
     resource.bevel_width = 3;
 
   if (conf.getValue("frameWidth", "FrameWidth", l)) {
-    if (l <= getWidth() / 2)
+    if (l <= size().w() / 2)
       resource.frame_width = l;
     else
       resource.frame_width = resource.bevel_width;
@@ -2188,8 +2187,8 @@ void BScreen::shutdown(void) {
 void BScreen::showPosition(int x, int y) {
   if (! geom_visible) {
     XMoveResizeWindow(getBaseDisplay().getXDisplay(), geom_window,
-                      (getWidth() - geom_w) / 2,
-                      (getHeight() - geom_h) / 2, geom_w, geom_h);
+                      (size().w() - geom_w) / 2,
+                      (size().h() - geom_h) / 2, geom_w, geom_h);
     XMapWindow(getBaseDisplay().getXDisplay(), geom_window);
     XRaiseWindow(getBaseDisplay().getXDisplay(), geom_window);
 
@@ -2222,8 +2221,8 @@ void BScreen::showPosition(int x, int y) {
 void BScreen::showGeometry(unsigned int gx, unsigned int gy) {
   if (! geom_visible) {
     XMoveResizeWindow(getBaseDisplay().getXDisplay(), geom_window,
-                      (getWidth() - geom_w) / 2,
-                      (getHeight() - geom_h) / 2, geom_w, geom_h);
+                      (size().w() - geom_w) / 2,
+                      (size().h() - geom_h) / 2, geom_w, geom_h);
     XMapWindow(getBaseDisplay().getXDisplay(), geom_window);
     XRaiseWindow(getBaseDisplay().getXDisplay(), geom_window);