nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adjust saturation/brightness on task icon

Browse source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@160 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
lorthiois@bbsoft.fr 2009-08-29 12:00:11 +00:00
parent 3d37d78100
commit 8eb1d35fc8
5 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,3 +1,6 @@
2009-08-29
- adjust saturation/brightness on task icon
2009-08-29 2009-08-29
- merge change described in issue 122 (by jackp) - merge change described in issue 122 (by jackp)
made right click easier made right click easier

2
configure.ac
View file

@ -1,6 +1,6 @@
# -*- Autoconf -*- # -*- Autoconf -*-
# Process this file with autoconf to produce a configure script. # 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 AM_INIT_AUTOMAKE

3
src/Makefile.am
View file

@ -10,6 +10,7 @@ bin_PROGRAMS = tint2
tint2_SOURCES = config.c \ tint2_SOURCES = config.c \
util/area.h \ util/area.h \
util/common.h \ util/common.h \
util/common.c \
util/area.c \ util/area.c \
util/window.h \ util/window.h \
util/window.c \ util/window.c \
@ -26,7 +27,7 @@ tint2_SOURCES = config.c \
taskbar/taskbar.c \ taskbar/taskbar.c \
taskbar/task.c \ taskbar/task.c \
taskbar/taskbar.h \ taskbar/taskbar.h \
taskbar/task.h taskbar/task.h
if ENABLE_BATTERY if ENABLE_BATTERY
DEFS += -DENABLE_BATTERY DEFS += -DENABLE_BATTERY

6
src/taskbar/task.c
View file

@ -238,6 +238,12 @@ void get_icon (Task *tsk)
tsk->icon_data_active = malloc (tsk->icon_width * tsk->icon_height * sizeof (DATA32)); 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)); 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);
}
} }

6
src/util/common.h
View file

@ -32,9 +32,6 @@ enum { NONE=0, CLOSE, TOGGLE, ICONIFY, SHADE, TOGGLE_ICONIFY, MAXIMIZE_RESTORE,
#define ALLDESKTOP 0xFFFFFFFF #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 typedef struct config_border
{ {
@ -52,6 +49,9 @@ typedef struct config_color
} 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 #endif