|
@@ -1014,6 +1014,7 @@ void laShowProgress(real p1, real p2){
|
|
|
if(!MAIN.Progress.Called){
|
|
if(!MAIN.Progress.Called){
|
|
|
laRecordTime(&MAIN.Progress.TimeCalled); MAIN.Progress.Called=1;
|
|
laRecordTime(&MAIN.Progress.TimeCalled); MAIN.Progress.Called=1;
|
|
|
}
|
|
}
|
|
|
|
|
+ if(p1>=0) MAIN.Progress.p1=p1; if(p2>=0) MAIN.Progress.p2=p2;
|
|
|
laTimeRecorder tm; laRecordTime(&tm);
|
|
laTimeRecorder tm; laRecordTime(&tm);
|
|
|
real t=laTimeElapsedSecondsf(&tm,&MAIN.Progress.TimeCalled); if(t<0.1){ laSpinUnlock(&MAIN.OpsLock); return; }
|
|
real t=laTimeElapsedSecondsf(&tm,&MAIN.Progress.TimeCalled); if(t<0.1){ laSpinUnlock(&MAIN.OpsLock); return; }
|
|
|
memcpy(&MAIN.Progress.TimeCalled,&tm,sizeof(laTimeRecorder));
|
|
memcpy(&MAIN.Progress.TimeCalled,&tm,sizeof(laTimeRecorder));
|
|
@@ -1035,7 +1036,6 @@ void laShowProgress(real p1, real p2){
|
|
|
#endif
|
|
#endif
|
|
|
MAIN.Progress.Shown = 1;
|
|
MAIN.Progress.Shown = 1;
|
|
|
}
|
|
}
|
|
|
- if(p1>=0) MAIN.Progress.p1=p1; if(p2>=0) MAIN.Progress.p2=p2;
|
|
|
|
|
#ifdef LA_LINUX
|
|
#ifdef LA_LINUX
|
|
|
XClearWindow(MAIN.dpy,MAIN.Progress.w);
|
|
XClearWindow(MAIN.dpy,MAIN.Progress.w);
|
|
|
XFillRectangle(MAIN.dpy,MAIN.Progress.w,MAIN.Progress.gc,LA_RH*2,0,PROGRESSW*MAIN.Progress.p1,LA_RH);
|
|
XFillRectangle(MAIN.dpy,MAIN.Progress.w,MAIN.Progress.gc,LA_RH*2,0,PROGRESSW*MAIN.Progress.p1,LA_RH);
|
|
@@ -2979,6 +2979,8 @@ void la_PanelDefDraw(laWindow *w, laPanel *p, laBoxedTheme *bt){
|
|
|
if (p->Refresh & LA_TAG_RECALC){
|
|
if (p->Refresh & LA_TAG_RECALC){
|
|
|
laRecalcPanelImmediate(p);
|
|
laRecalcPanelImmediate(p);
|
|
|
}
|
|
}
|
|
|
|
|
+ if(p->H<=0 || p->W<=0) return;
|
|
|
|
|
+
|
|
|
if (!p->MenuRefer){
|
|
if (!p->MenuRefer){
|
|
|
if(!p->OffScr){ la_PanelDrawToOffsceen(p,&p->UI); p->Refresh|=LA_TAG_REDRAW; laRefreshWindow(); }
|
|
if(!p->OffScr){ la_PanelDrawToOffsceen(p,&p->UI); p->Refresh|=LA_TAG_REDRAW; laRefreshWindow(); }
|
|
|
if (p->Refresh || !p->OffScr){
|
|
if (p->Refresh || !p->OffScr){
|