From 284c6ce6e4975cdfcb2bc40c292362cfa6b9f348 Mon Sep 17 00:00:00 2001
From: K D Hedger <kdhedger68713@gmail.com>
Date: Thu, 13 Feb 2025 13:39:03 +0000
Subject: [PATCH] Fixed minor graphics glitch when setting 'no button borders'

---
 LFSPanel/LFSPanel/src/clock.cpp   |  2 +-
 LFSPanel/LFSPanel/src/cpu.cpp     |  2 +-
 LFSPanel/LFSPanel/src/disks.cpp   |  2 +-
 LFSPanel/LFSPanel/src/globals.cpp | 13 ++++---------
 LFSPanel/LFSPanel/src/main.cpp    |  3 +--
 LFSPanel/LFSPanel/src/slider.cpp  |  3 ++-
 LFSToolKit/examples/toggle.cpp    |  2 ++
 7 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/LFSPanel/LFSPanel/src/clock.cpp b/LFSPanel/LFSPanel/src/clock.cpp
index 16e617e..5fb0f3f 100644
--- a/LFSPanel/LFSPanel/src/clock.cpp
+++ b/LFSPanel/LFSPanel/src/clock.cpp
@@ -59,7 +59,7 @@ int addClock(int x,int y,int grav)
 	if(grav==NorthWestGravity)
 		xpos=x;
 	else
-		xpos=x-width;
+		xpos=x-width+1;
 
 	clockButton=new LFSTK_labelClass(mainwind,"--:--:--",xpos,0,width,panelHeight,CENTRE,grav);
 
diff --git a/LFSPanel/LFSPanel/src/cpu.cpp b/LFSPanel/LFSPanel/src/cpu.cpp
index 7112b88..bf230f7 100644
--- a/LFSPanel/LFSPanel/src/cpu.cpp
+++ b/LFSPanel/LFSPanel/src/cpu.cpp
@@ -90,7 +90,7 @@ int addCpuData(int x,int y,int grav)
 	if(grav==NorthWestGravity)
 		xpos=x;
 	else
-		xpos=x-width;
+		xpos=x-width+1;
 
 	setNewData();
 	cpuButton=new LFSTK_labelClass(mainwind,"CPU=0.0%",xpos,0,width,panelHeight,CENTRE,grav);
diff --git a/LFSPanel/LFSPanel/src/disks.cpp b/LFSPanel/LFSPanel/src/disks.cpp
index e6aff4b..5822cf2 100644
--- a/LFSPanel/LFSPanel/src/disks.cpp
+++ b/LFSPanel/LFSPanel/src/disks.cpp
@@ -90,7 +90,7 @@ int addDiskData(int x,int y,int grav)
 	if(grav==NorthWestGravity)
 		xpos=x;
 	else
-		xpos=x-width;
+		xpos=x-width+1;
 
 	oldRead=getReadStats();
 	oldWrite=getWriteStats();
diff --git a/LFSPanel/LFSPanel/src/globals.cpp b/LFSPanel/LFSPanel/src/globals.cpp
index af0ac1a..b7d6600 100644
--- a/LFSPanel/LFSPanel/src/globals.cpp
+++ b/LFSPanel/LFSPanel/src/globals.cpp
@@ -161,17 +161,12 @@ void setGadgetDetails(LFSTK_gadgetClass *gadget)
 		{
 			gadget->LFSTK_setAlpha(1.0);
 			gadget->LFSTK_setTile(NULL,0);
-		//	gadget->LFSTK_setColourName(NORMALCOLOUR,panelColour);
-//gadget->LFSTK_setFontColourName(NORMALCOLOUR,panelTextColour,true);
 			gadget->LFSTK_setGadgetColourPair(NORMALCOLOUR,panelColour,panelTextColour);
 
 			if(noButtons==true)
-				{
-					gadget->gadgetDetails.bevel=BEVELNONE;
-					gadget->LFSTK_setGadgetColours(GADGETFG,panelColour,panelColour,panelColour,panelColour);
-//					gadget->LFSTK_setColourName(PRELIGHTCOLOUR,panelColour);
-//					gadget->LFSTK_setColourName(ACTIVECOLOUR,panelColour);
-//					gadget->LFSTK_setColourName(INACTIVECOLOUR,panelColour);
-				}
+				gadget->LFSTK_setGadgetColours(GADGETFG,panelColour,panelColour,panelColour,panelColour);
 		}
+
+	if(noButtons==true)
+		gadget->LFSTK_setStyle(BEVELNONE);
 }
diff --git a/LFSPanel/LFSPanel/src/main.cpp b/LFSPanel/LFSPanel/src/main.cpp
index fb730cf..bac5fdc 100644
--- a/LFSPanel/LFSPanel/src/main.cpp
+++ b/LFSPanel/LFSPanel/src/main.cpp
@@ -54,9 +54,9 @@ void loadPrefs(const char *env)
 void addLeftGadgets(void)
 {
 	int	offset=leftOffset;
-
 	for(int j=0; j<prefs.LFSTK_getStringObject("gadgetsleft")->length();j++)
 		{
+
 			switch(prefs.LFSTK_getStringObject("gadgetsleft")->at(j))
 				{
 				case 'A':
@@ -97,7 +97,6 @@ void addLeftGadgets(void)
 					break;
 				}
 		}
-	offset++;
 	leftOffset=offset;
 }
 
diff --git a/LFSPanel/LFSPanel/src/slider.cpp b/LFSPanel/LFSPanel/src/slider.cpp
index ce37fb7..ec8a0c9 100644
--- a/LFSPanel/LFSPanel/src/slider.cpp
+++ b/LFSPanel/LFSPanel/src/slider.cpp
@@ -189,10 +189,11 @@ int addSlider(int x,int y,int grav,bool fromleft)
 	setSizes(&xpos,&ypos,&width,&height,&iconsize,&thisgrav,fromleft);
 	
 	volumeButton=new LFSTK_toggleButtonClass(mainwind,label,xpos,ypos,width,height,thisgrav);
+
 	volumeButton->LFSTK_setToggleStyle(TOGGLENORMAL);
 	volumeButton->LFSTK_setMouseCallBack(NULL,sliderCB,(void*)volumeButton->LFSTK_getLabel().c_str());
 
-	setGadgetDetails(volumeButton);//TODO//
+	setGadgetDetails(volumeButton);
 
 	iconH=mainwind->globalLib->LFSTK_findThemedIcon(desktopTheme,"volume-high","");
 	iconM=mainwind->globalLib->LFSTK_findThemedIcon(desktopTheme,"volume-medium","");
diff --git a/LFSToolKit/examples/toggle.cpp b/LFSToolKit/examples/toggle.cpp
index 22c84f7..4d83ad6 100755
--- a/LFSToolKit/examples/toggle.cpp
+++ b/LFSToolKit/examples/toggle.cpp
@@ -130,6 +130,8 @@ int main(int argc, char **argv)
 	toggle->LFSTK_setMouseCallBack(NULL,buttonCB,(void*)"Toggle");
 	toggle->LFSTK_setMouseMoveCallBack(enterCB,exitCB,USERDATA(0));
 	toggle->LFSTK_setToggleStyle(TOGGLENORMAL);
+	//toggle->LFSTK_setStyle(BEVELNONE);	
+
 	toggle->userData=USERDATA(1);
 
 	iconH=apc->globalLib->LFSTK_findThemedIcon("gnome","volume-high","");