use screen instead of its ImageControl to get/set the image dither value

[chaz/openbox] / src / Configmenu.cc

diff --git a/src/Configmenu.cc b/src/Configmenu.cc
index ffb5d6e3f8880cefb3bbd563b355c3bce00ec8fb..0a219662a8936b1a1f919a93881ca62af1113c28 100644 (file)
--- a/src/Configmenu.cc
+++ b/src/Configmenu.cc
@@ -67,7 +67,7 @@ Configmenu::Configmenu(BScreen &scr) : Basemenu(scr), screen(scr)
 }
 
 void Configmenu::setValues() {
-  setItemSelected(2, screen.getImageControl()->doDither());
+  setItemSelected(2, screen.imageDither());
   setItemSelected(3, screen.opaqueMove());
   setItemSelected(4, screen.fullMax());
   setItemSelected(5, screen.focusNew());
@@ -91,9 +91,9 @@ void Configmenu::itemSelected(int button, int index) {
 
   switch(item->function()) {
   case 1: { // dither
-    screen.setImageDither(!screen.getImageControl()->doDither());
+    screen.setImageDither(!screen.imageDither());
 
-    setItemSelected(index, screen.getImageControl()->doDither());
+    setItemSelected(index, screen.imageDither());
 
     break;
   }
@@ -185,14 +185,14 @@ void Configmenu::Focusmenu::itemSelected(int button, int index) {
     configmenu->screen.setSloppyFocus(false);
     configmenu->screen.setAutoRaise(false);
 
-    if (! configmenu->screen.getOpenbox().getFocusedWindow())
+    if (! configmenu->screen.getOpenbox().focusedWindow())
       XSetInputFocus(configmenu->screen.getOpenbox().getXDisplay(),
                     configmenu->screen.getToolbar()->getWindowID(),
                     RevertToParent, CurrentTime);
     else
       XSetInputFocus(configmenu->screen.getOpenbox().getXDisplay(),
                     configmenu->screen.getOpenbox().
-                    getFocusedWindow()->getClientWindow(),
+                    focusedWindow()->getClientWindow(),
                     RevertToParent, CurrentTime);
 
     configmenu->screen.reconfigure();