From: Thierry Lorthiois Date: Sat, 29 Aug 2009 12:00:11 +0000 (+0000) Subject: adjust saturation/brightness on task icon X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=1ac35c69ce875cbee3740cffee1cb9d41dcc34ef;p=chaz%2Ftint2 adjust saturation/brightness on task icon --- diff --git a/ChangeLog b/ChangeLog index 92b1350..ef853c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2009-08-29 +- adjust saturation/brightness on task icon + 2009-08-29 - merge change described in issue 122 (by jackp) made right click easier diff --git a/configure.ac b/configure.ac index 01f1b96..4a2f5d3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([tint2], [9.9.9-svn], [http://code.google.com/p/tint2/issues]) +AC_INIT([tint2], [0.7.9-svn], [http://code.google.com/p/tint2/issues]) AM_INIT_AUTOMAKE diff --git a/src/Makefile.am b/src/Makefile.am index 6361366..7441734 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,6 +10,7 @@ bin_PROGRAMS = tint2 tint2_SOURCES = config.c \ util/area.h \ util/common.h \ + util/common.c \ util/area.c \ util/window.h \ util/window.c \ @@ -26,7 +27,7 @@ tint2_SOURCES = config.c \ taskbar/taskbar.c \ taskbar/task.c \ taskbar/taskbar.h \ - taskbar/task.h + taskbar/task.h if ENABLE_BATTERY DEFS += -DENABLE_BATTERY diff --git a/src/taskbar/task.c b/src/taskbar/task.c index e7314ed..ff0bd50 100644 --- a/src/taskbar/task.c +++ b/src/taskbar/task.c @@ -238,6 +238,12 @@ void get_icon (Task *tsk) tsk->icon_data_active = malloc (tsk->icon_width * tsk->icon_height * sizeof (DATA32)); memcpy (tsk->icon_data_active, tsk->icon_data, tsk->icon_width * tsk->icon_height * sizeof (DATA32)); + if (panel->g_task.hue != 0 || panel->g_task.saturation != 0 || panel->g_task.brightness != 0) { + adjust_hsb(tsk->icon_data, tsk->icon_width, tsk->icon_height, (float)panel->g_task.hue/100, (float)panel->g_task.saturation/100, (float)panel->g_task.brightness/100); + } + if (panel->g_task.hue_active != 0 || panel->g_task.saturation_active != 0 || panel->g_task.brightness_active != 0) { + adjust_hsb(tsk->icon_data_active, tsk->icon_width, tsk->icon_height, (float)panel->g_task.hue_active/100, (float)panel->g_task.saturation_active/100, (float)panel->g_task.brightness_active/100); + } } diff --git a/src/util/common.h b/src/util/common.h index e874ba6..bb67481 100644 --- a/src/util/common.h +++ b/src/util/common.h @@ -32,9 +32,6 @@ enum { NONE=0, CLOSE, TOGGLE, ICONIFY, SHADE, TOGGLE_ICONIFY, MAXIMIZE_RESTORE, #define ALLDESKTOP 0xFFFFFFFF -#define MIN3(x,y,z) ((y) <= (z) ? ((x) <= (y) ? (x) : (y)) : ((x) <= (z) ? (x) : (z))) -#define MAX3(x,y,z) ((y) >= (z) ? ((x) >= (y) ? (x) : (y)) : ((x) >= (z) ? (x) : (z))) - typedef struct config_border { @@ -52,6 +49,9 @@ typedef struct config_color } config_color; +// adjust HSB on an ARGB icon +void adjust_hsb(unsigned int *data, int w, int h, float hue, float satur, float bright); + #endif