Skip to content

Commit fb6cfb4

Browse files
committed
Fixed dock spuriously reappearing after iconizing
1 parent 48114ab commit fb6cfb4

File tree

7 files changed

+12
-2
lines changed

7 files changed

+12
-2
lines changed

LFSDock/ChangeLog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
0.2.1
2+
Fixed dock spuriously reappearing after iconizing.
23
Adjusted dock window context menu position.
34
Added context menu to main dock window.
45
Added "Iconize Dock" to launcher context window.

LFSDock/LFSDock/src/callbacks.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ bool gadgetDrop(void *lwc,propertyStruct *data,void* ud)
8888

8989
bool timerCB(LFSTK_applicationClass *p,void* ud)
9090
{
91+
// if(dockIsHidden==false)
92+
// return(true);
93+
9194
readMsg();
9295

9396
if(clockButton!=NULL)
@@ -246,6 +249,7 @@ bool hideCB(void* p,void* ud)
246249
if(bc!=NULL)
247250
{
248251
iconWindow->LFSTK_hideWindow();
252+
dockIsHidden=false;
249253
if(useTaskBar==true)
250254
{
251255
oldwidth=0;

LFSDock/LFSDock/src/globals.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ LFSTK_windowClass *dockWindow=NULL;
6262
LFSTK_windowClass *dockBGWindow=NULL;
6363
LFSTK_windowClass *iconWindow=NULL;
6464
int holdpsize;
65+
bool dockIsHidden=false;
6566

6667
LFSTK_windowClass *popActionWindow=NULL;
6768
LFSTK_listGadgetClass *popActionList=NULL;

LFSDock/LFSDock/src/globals.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@ extern LFSTK_windowClass *dockWindow;
116116
extern LFSTK_windowClass *dockBGWindow;
117117
extern LFSTK_windowClass *iconWindow;
118118
extern int holdpsize;
119-
120-
119+
extern bool dockIsHidden;
121120

122121
extern LFSTK_windowClass *mainContextWindow;
123122

LFSDock/LFSDock/src/launchers.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ bool launcherContextCB(void *p,void* ud)
7272
break;
7373
case BUTTONHIDE:
7474
resizeDock(1,1);
75+
dockIsHidden=true;
7576
iconWindow->LFSTK_showWindow();
7677
iconWindow->LFSTK_clearWindow(true);
7778
if(calWindow!=NULL)

LFSDock/LFSDock/src/main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ bool contextCB(void *p,void* ud)
6363
break;
6464
case CONTEXTBUTTONHIDE:
6565
resizeDock(1,1);
66+
dockIsHidden=true;
6667
iconWindow->LFSTK_showWindow();
6768
iconWindow->LFSTK_clearWindow(true);
6869
if(calWindow!=NULL)

LFSDock/LFSDock/src/taskBar.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,9 @@ void updateTaskBar(bool force)//TODO//
238238
bool goodkey;
239239
bool unequal=false;
240240

241+
if(dockIsHidden==true)
242+
return;
243+
241244
tasks.clear();
242245
doTreeWalkForTasks(apc->rootWindow);
243246
std::sort(tasks.begin(),tasks.end(),compareTaskClass);

0 commit comments

Comments
 (0)