Fixed bsetroot to use the new Geometries returned in ScreenInfo

diff --git a/util/Makefile.am b/util/Makefile.am
index 50a0aebf6f440c59ad18076f1db79da336154ed5..6fdafeda970b171d3f84df9016cd114be9eb8447 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -7,7 +7,7 @@ bin_SCRIPTS =           bsetbg
 bin_PROGRAMS =         bsetroot
 
 bsetroot_SOURCES =     bsetroot.cc
-bsetroot_LDADD =       ../src/BaseDisplay.o ../src/LinkedList.o ../src/Timer.o ../src/Image.o ../src/i18n.o
+bsetroot_LDADD =       ../src/BaseDisplay.o ../src/LinkedList.o ../src/Timer.o ../src/Image.o ../src/i18n.o ../src/Geometry.o
 
 MAINTAINERCLEANFILES = Makefile.in
 
@@ -15,4 +15,4 @@ distclean-local:
        rm -f *\~
 
 bsetroot.o: bsetroot.cc ../config.h bsetroot.h ../src/BaseDisplay.h \
- ../src/LinkedList.h ../src/Timer.h ../src/Image.h
+ ../src/LinkedList.h ../src/Timer.h ../src/Image.h ../src/Geometry.h

diff --git a/util/bsetroot.cc b/util/bsetroot.cc
index d9cd4fb2d494e7a247590c8b1313e8e7940da2c2..db789612518eed82372b88779d0ca45e8af86662 100644 (file)
--- a/util/bsetroot.cc
+++ b/util/bsetroot.cc
@@ -220,8 +220,8 @@ void bsetroot::gradient(void) {
       texture.getColorTo()->setPixel(BlackPixel(getXDisplay(), screen));
 
     pixmaps[screen] =
-      img_ctrl[screen]->renderImage(getScreenInfo(screen)->getWidth(),
-                                    getScreenInfo(screen)->getHeight(),
+      img_ctrl[screen]->renderImage(getScreenInfo(screen)->size().w(),
+                                    getScreenInfo(screen)->size().h(),
                                     &texture);
 
     XSetWindowBackgroundPixmap(getXDisplay(),