diff --git a/LFSDock/ChangeLog b/LFSDock/ChangeLog index 07401f5..eb91c1b 100644 --- a/LFSDock/ChangeLog +++ b/LFSDock/ChangeLog @@ -1,4 +1,5 @@ 0.2.1 +Fixed dock spuriously reappearing after iconizing. Adjusted dock window context menu position. Added context menu to main dock window. Added "Iconize Dock" to launcher context window. diff --git a/LFSDock/LFSDock/src/callbacks.cpp b/LFSDock/LFSDock/src/callbacks.cpp index 82cd73f..d38d587 100644 --- a/LFSDock/LFSDock/src/callbacks.cpp +++ b/LFSDock/LFSDock/src/callbacks.cpp @@ -88,6 +88,9 @@ bool gadgetDrop(void *lwc,propertyStruct *data,void* ud) bool timerCB(LFSTK_applicationClass *p,void* ud) { +// if(dockIsHidden==false) +// return(true); + readMsg(); if(clockButton!=NULL) @@ -246,6 +249,7 @@ bool hideCB(void* p,void* ud) if(bc!=NULL) { iconWindow->LFSTK_hideWindow(); + dockIsHidden=false; if(useTaskBar==true) { oldwidth=0; diff --git a/LFSDock/LFSDock/src/globals.cpp b/LFSDock/LFSDock/src/globals.cpp index c8b0b2f..4596406 100644 --- a/LFSDock/LFSDock/src/globals.cpp +++ b/LFSDock/LFSDock/src/globals.cpp @@ -62,6 +62,7 @@ LFSTK_windowClass *dockWindow=NULL; LFSTK_windowClass *dockBGWindow=NULL; LFSTK_windowClass *iconWindow=NULL; int holdpsize; +bool dockIsHidden=false; LFSTK_windowClass *popActionWindow=NULL; LFSTK_listGadgetClass *popActionList=NULL; diff --git a/LFSDock/LFSDock/src/globals.h b/LFSDock/LFSDock/src/globals.h index 209cc74..22c9d5e 100644 --- a/LFSDock/LFSDock/src/globals.h +++ b/LFSDock/LFSDock/src/globals.h @@ -116,8 +116,7 @@ extern LFSTK_windowClass *dockWindow; extern LFSTK_windowClass *dockBGWindow; extern LFSTK_windowClass *iconWindow; extern int holdpsize; - - +extern bool dockIsHidden; extern LFSTK_windowClass *mainContextWindow; diff --git a/LFSDock/LFSDock/src/launchers.cpp b/LFSDock/LFSDock/src/launchers.cpp index 216bb9a..d0835f9 100644 --- a/LFSDock/LFSDock/src/launchers.cpp +++ b/LFSDock/LFSDock/src/launchers.cpp @@ -72,6 +72,7 @@ bool launcherContextCB(void *p,void* ud) break; case BUTTONHIDE: resizeDock(1,1); + dockIsHidden=true; iconWindow->LFSTK_showWindow(); iconWindow->LFSTK_clearWindow(true); if(calWindow!=NULL) diff --git a/LFSDock/LFSDock/src/main.cpp b/LFSDock/LFSDock/src/main.cpp index 877ac7e..391ba6a 100644 --- a/LFSDock/LFSDock/src/main.cpp +++ b/LFSDock/LFSDock/src/main.cpp @@ -63,6 +63,7 @@ bool contextCB(void *p,void* ud) break; case CONTEXTBUTTONHIDE: resizeDock(1,1); + dockIsHidden=true; iconWindow->LFSTK_showWindow(); iconWindow->LFSTK_clearWindow(true); if(calWindow!=NULL) diff --git a/LFSDock/LFSDock/src/taskBar.cpp b/LFSDock/LFSDock/src/taskBar.cpp index 5bdafdb..c918224 100644 --- a/LFSDock/LFSDock/src/taskBar.cpp +++ b/LFSDock/LFSDock/src/taskBar.cpp @@ -238,6 +238,9 @@ void updateTaskBar(bool force)//TODO// bool goodkey; bool unequal=false; + if(dockIsHidden==true) + return; + tasks.clear(); doTreeWalkForTasks(apc->rootWindow); std::sort(tasks.begin(),tasks.end(),compareTaskClass);