code clean

Author: KeithDHedger

LFSToolKit/LFSToolKit/lfstk/LFSTKGadget.cpp

@@ -803,7 +803,7 @@ void LFSTK_gadgetClass::LFSTK_resizeWindow(int w,int h)
 	this->gadgetDetails.gadgetGeom.w=w;
 	this->gadgetDetails.gadgetGeom.h=h;
 	XResizeWindow(this->wc->app->display,this->window,this->gadgetGeom.w,this->gadgetGeom.h);
-	this->wc->globalLib->LFSTK_setCairoSurface(this->wc->app->display,this->window,this->wc->app->visual,&this->sfc,&this->cr,w,h);
+	this->resizeCairoParts(w,h);
 
 	this->LFSTK_clearWindow();
 }
@@ -1609,6 +1609,18 @@ void LFSTK_gadgetClass::LFSTK_setShowIndicator(bool show)
 	this->showIndicator=show;
 }
 
+/**
+* Resize cairo surface and context to gadget size.
+* \param int width.
+* \param int height.
+*/
+void LFSTK_gadgetClass::resizeCairoParts(int width,int height)
+{
+	cairo_xlib_surface_set_size(this->sfc,width,height);
+	cairo_destroy(this->cr);
+	this->cr=cairo_create(this->sfc);
+}
+
 /**
 * Set gadget size.
 * \param int width.
@@ -1621,10 +1633,7 @@ void LFSTK_gadgetClass::LFSTK_setGadgetSize(int width,int height)
 	this->gadgetDetails.gadgetGeom.h=height;
 	this->gadgetGeom.w=width;
 	this->gadgetGeom.h=height;
-
-	cairo_xlib_surface_set_size(this->sfc,width,height);
-	cairo_destroy(this->cr);
-	this->cr=cairo_create(this->sfc);
+	this->resizeCairoParts(width,height);
 }
 
 /**

LFSToolKit/LFSToolKit/lfstk/LFSTKGadget.h

@@ -192,6 +192,7 @@ class LFSTK_gadgetClass
 		void					selectBevel(bool mousedown);
 		cairo_surface_t		*link=NULL;
 		cairo_surface_t		*broken=NULL;
+		void					resizeCairoParts(int width,int height);
 
 	protected:
 		mappedListener		*ml=NULL;

LFSToolKit/LFSToolKit/lfstk/LFSTKLib.cpp

@@ -812,7 +812,6 @@ unsigned long LFSTK_lib::LFSTK_getColourFromName(Display *display,Colormap cm,co
 * \param int width.
 * \param int height.
 */
-#if 1
 void LFSTK_lib::LFSTK_setCairoSurface(Display *display,Window window,Visual *visual,cairo_surface_t **sfc,cairo_t **cr,int width,int height)
 {
 	if((height<1) || (width<1))
@@ -828,44 +827,6 @@ void LFSTK_lib::LFSTK_setCairoSurface(Display *display,Window window,Visual *vis
 
 	*cr=cairo_create(*sfc);
 }
-#else
-void LFSTK_lib::LFSTK_setCairoSurface(Display *display,Window window,Visual *visual,cairo_surface_t **sfc,cairo_t **cr,int width,int height)
-{
-	if((height<1) || (width<1))
-		return;
-fprintf(stderr,"srfc=%p\n",*sfc);
-//if(*sfc!=NULL)
-//	fprintf(stderr,"cw=%i ch=%i\n",cairo_xlib_surface_get_width (*sfc),cairo_xlib_surface_get_height (*sfc));
-
-if((sfc!=NULL) && (*sfc!=NULL))
-{
-fprintf(stderr,"00000\n");
-	cairo_surface_destroy (*sfc);
-
-		
-//sfc=cairo_xlib_surface_create(display,window,visual,width,height);
-*sfc=NULL;
-}
-
-	if(*sfc==NULL)
-	//{
-		*sfc=cairo_xlib_surface_create(display,window,visual,width,height);
-	//	}
-	else
-		cairo_xlib_surface_set_size(*sfc,width,height);
-
-//fprintf(stderr,"cw=%i ch=%i\n",cairo_xlib_surface_get_width (*sfc),cairo_xlib_surface_get_height (*sfc));
-
-	if((cr!=NULL) && (*cr!=NULL))
-		{
-		cairo_destroy (*cr);
-		*cr=NULL;
-		}
-//else
-if(*cr==NULL)
-		*cr=cairo_create(*sfc);
-}
-#endif
 
 /**
 * Get mime type of file.

LFSToolKit/LFSToolKit/lfstk/LFSTKWindow.cpp

@@ -370,6 +370,18 @@ void LFSTK_windowClass::LFSTK_clearWindow(bool cleargadgets)
 		}
 }
 
+/**
+* Resize cairo surface and context to window size.
+* \param int width.
+* \param int height.
+*/
+void LFSTK_windowClass::resizeCairoParts(int width,int height)
+{
+	cairo_xlib_surface_set_size(this->sfc,width,height);
+	cairo_destroy(this->cr);
+	this->cr=cairo_create(this->sfc);
+}
+
 /**
 * Resize window.
 * \param w New width.
@@ -382,8 +394,8 @@ void LFSTK_windowClass::LFSTK_resizeWindow(int w,int h,bool tellx)
 	this->setWindowGeom(0,0,w,h,WINDSETWH);
 	if(tellx==true)
 		XResizeWindow(this->app->display,this->window,w,h);
- 
-  	this->globalLib->LFSTK_setCairoSurface(this->app->display,this->window,this->visual,&this->sfc,&this->cr,w,h);
+
+	this->resizeCairoParts(w,h);
   	this->w=w;
   	this->h=h;
 	this->LFSTK_clearWindow(true);
@@ -418,7 +430,7 @@ void LFSTK_windowClass::LFSTK_moveResizeWindow(int x,int y,int w,int h,bool tell
 	if(tellx==true)
 		XMoveResizeWindow(this->app->display,this->window,x,y,w,h);
 
-	this->globalLib->LFSTK_setCairoSurface(this->app->display,this->window,this->visual,&this->sfc,&this->cr,w,h);
+	this->resizeCairoParts(w,h);
   	this->w=w;
   	this->h=h;
 	this->LFSTK_clearWindow();
@@ -1008,7 +1020,6 @@ void LFSTK_windowClass::LFSTK_setTile(const char *path,int size)
 			return;
 		}
 
-
 	if(this->cr!=NULL)
 		cairo_destroy(this->cr);
 	if(this->sfc!=NULL)

LFSToolKit/LFSToolKit/lfstk/LFSTKWindow.h

@@ -190,7 +190,6 @@ class LFSTK_windowClass
 
 	protected:
 		bool					isActive;
-		//char					*windowName=NULL;
 		std::string			windowName="LFSTK Window";
 		void					initWindow(bool loadvars);
 
@@ -199,6 +198,7 @@ class LFSTK_windowClass
 		void					windowClassInitCommon(windowInitStruct *wi);
 		void					loadGlobalColours(void);
 		void					sendUTF8(XSelectionRequestEvent *sev);
+		void					resizeCairoParts(int width,int height);
 
 //DnD routines
 		void					LFSTK_dropData(propertyStruct* data);