Merge pull request #196 from dkondor/icons_extra_scale

Add extra scale parameter for icons

Author: dkondor

CMakeLists.txt

@@ -13,7 +13,7 @@ include (GNUInstallDirs)
 
 ########### project ###############
 
-set (VERSION "3.6.90") # no dash, only numbers, dots and maybe alpha/beta/rc, e.g.: 3.3.1 or 3.3.99.alpha1
+set (VERSION "3.6.91") # no dash, only numbers, dots and maybe alpha/beta/rc, e.g.: 3.3.1 or 3.3.99.alpha1
 
 add_compile_options (-std=c99 -Wall -Wextra -Werror-implicit-function-declaration) # -Wextra -Wwrite-strings -Wuninitialized -Wstrict-prototypes -Wreturn-type -Wparentheses -Warray-bounds)
 if (NOT DEFINED CMAKE_BUILD_TYPE)

data/cairo-dock.conf.in

@@ -503,6 +503,10 @@ launcher size = 40;40
 #{in pixels.}
 icon gap = 0
 
+#e+[0.4;1;smaller;bigger] Extra icon scale :
+#{You can choose to make the icons smaller, leaving an extra gap around them.}
+extra scale = 1.
+
 #F+[Zoom effect;@pkgdatadir@/icons/icon-wave.png]
 frame_shape =
 #f+[1;5] Maximum zoom of the icons :

src/gldit/cairo-dock-draw-opengl.c

@@ -347,6 +347,7 @@ void cairo_dock_render_one_icon_opengl (Icon *icon, CairoDock *pDock, double fDo
 			glTranslatef ((!pDock->container.bDirectionUp ? icon->fHeight * (- icon->fScale + 1)/2 : icon->fHeight * (icon->fScale - 1)/2), 0., 0.);
 		}
 	}
+	glScalef (myIconsParam.fExtraScale, myIconsParam.fExtraScale, 1.);
 	if (icon->fOrientation != 0)
 	{
 		glTranslatef (-icon->fWidth * icon->fScale/2, icon->fHeight * icon->fScale/2, 0.);

src/gldit/cairo-dock-draw.c

@@ -574,6 +574,11 @@ void cairo_dock_render_one_icon (Icon *icon, CairoDock *pDock, cairo_t *pCairoCo
 
 	cairo_save (pCairoContext);
 
+	cairo_translate (pCairoContext,
+		0.5 * (1.0 - myIconsParam.fExtraScale) * icon->fWidth * icon->fWidthFactor * icon->fScale,
+		0.5 * (1.0 - myIconsParam.fExtraScale) * icon->fHeight * icon->fHeightFactor * icon->fScale);
+	cairo_scale (pCairoContext, myIconsParam.fExtraScale, myIconsParam.fExtraScale);
+	
 	//\_____________________ On positionne l'icone.
 	if (icon->fOrientation != 0)
 		cairo_rotate (pCairoContext, icon->fOrientation);

src/gldit/cairo-dock-icon-manager.c

@@ -481,6 +481,7 @@ static gboolean get_config (GKeyFile *pKeyFile, CairoIconsParam *pIcons)
 		pIcons->iIconWidth = 48;
 	if (pIcons->iIconHeight == 0)
 		pIcons->iIconHeight = 48;
+	pIcons->fExtraScale = cairo_dock_get_double_key_value (pKeyFile, "Icons", "extra scale", &bFlushConfFileNeeded, 1., NULL, NULL);
 
 	//\___________________ Parametres des separateurs.
 	cairo_dock_get_size_key_value_helper (pKeyFile, "Icons", "separator ", bFlushConfFileNeeded, pIcons->iSeparatorWidth, pIcons->iSeparatorHeight);

src/gldit/cairo-dock-icon-manager.h

@@ -83,6 +83,7 @@ struct _CairoIconsParam {
 	gboolean bLabelForPointedIconOnly;
 	gint iLabelSize;  // taille des etiquettes des icones, en prenant en compte le contour et la marge.
 	gdouble fLabelAlphaThreshold;
+	gdouble fExtraScale;
 	};
 
 /// signals