Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove patch on omnipresent task to try another solution

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@197 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
lorthiois@bbsoft.fr
2009-09-25 21:40:06 +00:00
parent 8f4e5c269d
commit c59330d16a
5 changed files with 41 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/taskbar/task.c
View File

@@ -61,16 +61,16 @@ Task *add_task (Window win)
Taskbar *tskbar;
Task *new_tsk2=0;
int i, j;
for (i = 0; i < nb_panel; i++) {
if (nb_panel > 1 && panel1[i].monitor != monitor) continue;
for (j = 0; j < panel1[i].nb_desktop; j++) {
if ((new_tsk.desktop != ALLDESKTOP && new_tsk.desktop != j)
|| (panel_mode == MULTI_DESKTOP && new_tsk.desktop == ALLDESKTOP && server.desktop != j))
continue;
// for (i=0 ; i < nb_panel ; i++) {
// for (j=0 ; j < panel1[i].nb_desktop ; j++) {
// if (new_tsk.desktop != ALLDESKTOP && new_tsk.desktop != j) continue;
// if (nb_panel > 1 && panel1[i].monitor != monitor) continue;
// for (i = 0; i < nb_panel; i++) {
// if (nb_panel > 1 && panel1[i].monitor != monitor) continue;
// for (j = 0; j < panel1[i].nb_desktop; j++) {
// if ((new_tsk.desktop != ALLDESKTOP && new_tsk.desktop != j)
// || (panel_mode == MULTI_DESKTOP && new_tsk.desktop == ALLDESKTOP && server.desktop != j))
// continue;
for (i=0 ; i < nb_panel ; i++) {
for (j=0 ; j < panel1[i].nb_desktop ; j++) {
if (new_tsk.desktop != ALLDESKTOP && new_tsk.desktop != j) continue;
if (nb_panel > 1 && panel1[i].monitor != monitor) continue;
tskbar = &panel1[i].taskbar[j];
new_tsk2 = malloc(sizeof(Task));

2
src/taskbar/taskbar.c
View File

@@ -258,6 +258,7 @@ void resize_taskbar(void *obj)
x = taskbar->area.posx + taskbar->area.pix.border.width + taskbar->area.paddingxlr;
for (l = taskbar->area.list; l ; l = l->next) {
tsk = l->data;
if (!tsk->area.on_screen) continue;
tsk->area.posx = x;
tsk->area.width = pixel_width;
tsk->area.redraw = 1;
@@ -299,6 +300,7 @@ void resize_taskbar(void *obj)
y = taskbar->area.posy + taskbar->area.pix.border.width + taskbar->area.paddingxlr;
for (l = taskbar->area.list; l ; l = l->next) {
tsk = l->data;
if (!tsk->area.on_screen) continue;
tsk->area.posy = y;
tsk->area.height = pixel_height;
tsk->area.redraw = 1;

2
src/taskbar/taskbar.h
View File

@@ -10,7 +10,7 @@
#include "task.h"
// tint2 use one taskbar per desktop.
typedef struct {
// always start with area
Area area;