Skip to content

Commit a46fbc4

Browse files
KeithDHedgerKeithDHedger
committed
gui fixes for examples
1 parent b23dbf2 commit a46fbc4

18 files changed

Lines changed: 131 additions & 106 deletions

‎LFSToolKit/examples/RunExamples.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@ bool buttonCB(void *p,void* ud)
6060
free(command);
6161
if(openFile->LFSTK_getValue()==true)
6262
{
63-
//asprintf(&command,"xdg-open $(pwd)/%s &",(const char*)ud);
64-
asprintf(&command,"$(pwd)/openincurrent \"$(pwd)/%s\"",(const char*)ud);
65-
fprintf(stderr,"%s\n",command);
63+
asprintf(&command,"xdg-open %s",(const char*)ud);
6664
system(command);
6765
free(command);
6866
}
@@ -93,7 +91,10 @@ int main(int argc, char **argv)
9391

9492
apc=new LFSTK_applicationClass();
9593
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
94+
9695
wc=apc->mainWindow;
96+
wc->LFSTK_setWindowType(apc->appAtomsHashed.at(LFSTK_UtilityClass::LFSTK_hashFromKey("_NET_WM_WINDOW_TYPE_DIALOG")));
97+
wc->LFSTK_setDecorations(false,false,true,false);
9798

9899
//info
99100
multi=new LFSTK_ExpanderGadgetClass(wc,"",0,0,DIALOGWIDTH,GADGETHITE*4);

‎LFSToolKit/examples/basic.cpp‎

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -166,31 +166,20 @@ bool gadgetDrop(void *lwc,propertyStruct *data,void* ud)
166166

167167
int main(int argc, char **argv)
168168
{
169-
int sy=BORDER;
169+
int sy=BORDER;
170+
windowInitStruct *win;
170171

171172
apc=new LFSTK_applicationClass();
172-
//
173-
//apc->globalLib->LFSTK_setGlobalString(NORMALCOLOUR,TYPEBUTTON,"pink");
174-
//apc->globalLib->LFSTK_setGlobalString(-1,TYPEBUTTONTILE,"/home/keithhedger/Patterns/button-prelight.png");
175-
//apc->globalLib->LFSTK_setGlobalString(ACTIVECOLOUR,TYPEBUTTON,"green");
176-
//apc->globalLib->LFSTK_setGlobalString(ACTIVECOLOUR,TYPEFONTCOLOUR,"blue");
177-
//apc->globalLib->LFSTK_setGlobalString(NORMALCOLOUR,TYPEWINDOW,"red");
178-
//apc->globalLib->LFSTK_setGlobalString(-1,TYPEWINDOWTILE,"/home/keithhedger/Patterns/halloweenwood.jpg");//TODO//jpeg not working
179-
180-
//apc->globalLib->LFSTK_setUseTheme(true);
181-
//apc->globalLib->LFSTK_setGlobalString(ACTIVECOLOUR,TYPEWINDOW,"cyan");
182-
//apc->globalLib->LFSTK_setGlobalString(PRELIGHTCOLOUR,TYPEWINDOW,"blue");
183-
//apc->globalLib->LFSTK_setGlobalString(INACTIVECOLOUR,TYPEWINDOW,"yellow");
184-
185-
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
186173

174+
win=apc->LFSTK_getDefaultWInit();
175+
win->windowName=BOXLABEL;
176+
win->windowType=win->app->appAtomsHashed.at(LFSTK_UtilityClass::LFSTK_hashFromKey("_NET_WM_WINDOW_TYPE_DIALOG"));
177+
win->level=ABOVEALL;
178+
apc->LFSTK_addWindow(win,BOXLABEL);
187179
wc=apc->mainWindow;
188180

189-
//wc->LFSTK_setTile("/home/keithhedger/Desktop/001_wood_coldgrayfence_th.jpg",-1);//TODO//this works ?//poss set usetheme
190-
191181
wc->LFSTK_initDnD(false);
192182

193-
//wc->LFSTK_setWindowColourName(NORMALCOLOUR,"pink");
194183
label=new LFSTK_labelClass(wc,BOXLABEL,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE,NorthGravity);
195184
label->LFSTK_setCairoFontDataParts("sB",20);
196185
sy+=YSPACING;
@@ -267,8 +256,6 @@ int main(int argc, char **argv)
267256
//leftButton->LFSTK_setTile("/home/keithhedger/Desktop/001_wood_coldgrayfence_th.jpg",-1);
268257
leftButton->LFSTK_setTile("./t2.jpg",-1);
269258
leftButton->gadgetDetails.geomRelativeToMainWindow=true;
270-
//leftButton->LFSTK_setAlpha(1.0);
271-
//fprintf(stderr,"leftButton tile=%i\n",leftButton->useTile);
272259
sy+=YSPACING+(GADGETWIDTH*2);
273260

274261
//centre image
@@ -312,8 +299,6 @@ int main(int argc, char **argv)
312299
popWindow->LFSTK_resizeWindow(poplabel->LFSTK_getTextRealWidth("This is a mouse enter callback"),GADGETHITE);
313300
popWindow->LFSTK_setWindowColourName(NORMALCOLOUR,"#c0808080");
314301

315-
//wc->LFSTK_setTile("/home/keithhedger/Backgrounds/bc3h.png",-1);
316-
317302
int retval=apc->LFSTK_runApp();
318303

319304
delete apc;

‎LFSToolKit/examples/calander.cpp‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,18 @@ bool doNext(void *p,void* ud)
159159

160160
int main(int argc, char **argv)
161161
{
162-
int txtwid;
163-
int txthite;
164-
int sy=BORDER;
165-
std::string thisday;
162+
int txtwid;
163+
int txthite;
164+
int sy=BORDER;
165+
std::string thisday;
166+
windowInitStruct *win;
166167

167168
apc=new LFSTK_applicationClass();
168-
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
169+
win=apc->LFSTK_getDefaultWInit();
170+
win->windowName=BOXLABEL;
171+
win->windowType=win->app->appAtomsHashed.at(LFSTK_UtilityClass::LFSTK_hashFromKey("_NET_WM_WINDOW_TYPE_DIALOG"));
172+
win->level=ABOVEALL;
173+
apc->LFSTK_addWindow(win,BOXLABEL);
169174
wc=apc->mainWindow;
170175

171176
thisday=apc->globalLib->LFSTK_oneLiner("%s","date +%m");
@@ -199,7 +204,6 @@ int main(int argc, char **argv)
199204
editbox->LFSTK_addHighLights(dx,dy,dl,dayhilite);
200205
setImportantDates();
201206
editbox->LFSTK_setStyle(BEVELNONE);
202-
// editbox->gadgetDetails.gadgetGeom=editbox->gadgetGeom;
203207
sy+=YSPACING+txthite;
204208

205209
less=new LFSTK_buttonClass(wc,"Last Month",BORDER,sy,GADGETWIDTH*2,GADGETHITE);

‎LFSToolKit/examples/colourchooser.cpp‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
#(c)keithhedger Mon 7 Dec 11:04:17 GMT 2020 kdhedger68713@gmail.com
44

5-
if [ "X$1" != "X" ];then
6-
USEVALGRIND="valgrind --leak-check=full"
7-
fi
8-
95
APPNAME=$(basename $0 .cpp)
106

117
g++ "$0" -O0 -ggdb -I../LFSToolKit -L../LFSToolKit/app/.libs $(pkg-config --cflags --libs x11 xft cairo glib-2.0) -llfstoolkit -lImlib2 -o $APPNAME||exit 1
@@ -123,8 +119,8 @@ bool lineCB(void *p,void *ud)
123119

124120
int main(int argc, char **argv)
125121
{
126-
XEvent event;
127-
int sy=BORDER;
122+
int sy=BORDER;
123+
windowInitStruct *win;
128124

129125
int c=0;
130126
int option_index=0;
@@ -157,9 +153,18 @@ int main(int argc, char **argv)
157153
}
158154

159155
apc=new LFSTK_applicationClass();
160-
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
156+
win=apc->LFSTK_getDefaultWInit();
157+
win->windowName=BOXLABEL;
158+
win->windowType=win->app->appAtomsHashed.at(LFSTK_UtilityClass::LFSTK_hashFromKey("_NET_WM_WINDOW_TYPE_DIALOG"));
159+
win->level=ABOVEALL;
160+
apc->LFSTK_addWindow(win,BOXLABEL);
161161
wc=apc->mainWindow;
162162

163+
164+
165+
// apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
166+
// wc=apc->mainWindow;
167+
163168
label=new LFSTK_labelClass(wc,BOXLABEL,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
164169
label->LFSTK_setCairoFontDataParts("sB",20);
165170
sy+=YSPACING;

‎LFSToolKit/examples/dialogs.cpp‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,13 @@ bool doQuit(void *p,void* ud)
4545

4646
bool selectcol(void *object,void* ud)
4747
{
48-
system("./colourchooser.cpp;echo");
48+
std::string command;
49+
50+
command="./colourchooser.cpp -w "+std::to_string(wc->window)+";echo";
51+
system(command.c_str());
4952
return(true);
5053
}
5154

52-
//use wd =~
5355
bool selectfile(void *object,void* ud)
5456
{
5557
std::string mimetype;
@@ -93,10 +95,16 @@ bool selectdir(void *object,void* ud)
9395

9496
int main(int argc, char **argv)
9597
{
96-
int sy=BORDER;
98+
int sy=BORDER;
99+
windowInitStruct *win;
97100

98101
apc=new LFSTK_applicationClass();
99-
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
102+
103+
win=apc->LFSTK_getDefaultWInit();
104+
win->windowName=BOXLABEL;
105+
win->windowType=win->app->appAtomsHashed.at(LFSTK_UtilityClass::LFSTK_hashFromKey("_NET_WM_WINDOW_TYPE_DIALOG"));
106+
win->level=ABOVEALL;
107+
apc->LFSTK_addWindow(win,BOXLABEL);
100108
wc=apc->mainWindow;
101109

102110
label=new LFSTK_labelClass(wc,BOXLABEL,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
@@ -112,12 +120,8 @@ int main(int argc, char **argv)
112120
//files and folders
113121
asprintf(&wd,"%s",apc->userHome.c_str());
114122
filedialogfile=new LFSTK_fileDialogClass(wc,"Select File",wd,FILEDIALOG);
115-
//filedialogfile->LFSTK_setNameFilter("*");
116-
//filedialogfile->useThumbs=true;
117-
//filedialogfile=new LFSTK_fileDialogClass(wc,"Select File",NULL,FILEDIALOG);
118123
filedialogdir=new LFSTK_fileDialogClass(wc,"Select Folder",NULL,FOLDERDIALOG,"dialogscpp");
119124

120-
// filedialogdir->LFSTK_setNameFilter("xfwm4");
121125
//TODO
122126
// filedialogfile->LFSTK_setShowPreview(false);
123127

‎LFSToolKit/examples/expander.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ int main(int argc, char **argv)
6464
win->level=NORMAL;
6565
apc->LFSTK_addWindow(win,BOXLABEL);
6666
wc=apc->mainWindow;
67+
wc->LFSTK_setDecorations(false,false,true,true);
6768

6869
multi=new LFSTK_ExpanderGadgetClass(wc,"",0,0,DIALOGWIDTH,GADGETHITE*3);
6970
multi->stretchX=false;

‎LFSToolKit/examples/geticonpath.cpp‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,15 @@ int main(int argc, char **argv)
7777
{
7878
int sy=BORDER;
7979
callbackStruct cbs;
80-
80+
windowInitStruct *win;
81+
8182
apc=new LFSTK_applicationClass();
82-
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
83+
84+
win=apc->LFSTK_getDefaultWInit();
85+
win->windowName=BOXLABEL;
86+
win->windowType=win->app->appAtomsHashed.at(LFSTK_UtilityClass::LFSTK_hashFromKey("_NET_WM_WINDOW_TYPE_DIALOG"));
87+
win->level=ABOVEALL;
88+
apc->LFSTK_addWindow(win,BOXLABEL);
8389
wc=apc->mainWindow;
8490

8591
label=new LFSTK_labelClass(wc,BOXLABEL,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);

‎LFSToolKit/examples/image.cpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,18 @@ bool exitCB(LFSTK_gadgetClass*p,void* ud)
139139

140140
int main(int argc, char **argv)
141141
{
142-
int sy=BORDER;
142+
int sy=BORDER;
143+
windowInitStruct *win;
143144

144145
apc=new LFSTK_applicationClass();
145146
apc->globalLib->LFSTK_setUseTheme(false);
146-
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
147+
win=apc->LFSTK_getDefaultWInit();
148+
win->windowName=BOXLABEL;
149+
win->windowType=win->app->appAtomsHashed.at(LFSTK_UtilityClass::LFSTK_hashFromKey("_NET_WM_WINDOW_TYPE_DIALOG"));
150+
win->level=ABOVEALL;
151+
apc->LFSTK_addWindow(win,BOXLABEL);
147152
wc=apc->mainWindow;
153+
148154
wc->LFSTK_setWindowPixmap(apc->globalLib->LFSTK_getWindowPixmap(apc->display,apc->rootWindow),DIALOGWIDTH,sy);
149155
tux=new LFSTK_imageClass(wc,NULL,DIALOGMIDDLE-(IMAGESIZE/2),sy,IMAGESIZE,IMAGESIZE,BUTTONGRAV,true);
150156
tux->LFSTK_setImageFromPath("./AspellGUI.png",PRESERVEASPECT,true);
@@ -195,8 +201,6 @@ int main(int argc, char **argv)
195201

196202

197203
//disks
198-
windowInitStruct *win;
199-
200204
win=new windowInitStruct;
201205
win->app=apc;
202206
win->windowName="";

‎LFSToolKit/examples/imagebutton.cpp‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,15 @@ bool buttonCB(void *p,void* ud)
5252

5353
int main(int argc, char **argv)
5454
{
55-
int sy=BORDER;
55+
int sy=BORDER;
56+
windowInitStruct *win;
5657

5758
apc=new LFSTK_applicationClass();
58-
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
59+
win=apc->LFSTK_getDefaultWInit();
60+
win->windowName=BOXLABEL;
61+
win->windowType=win->app->appAtomsHashed.at(LFSTK_UtilityClass::LFSTK_hashFromKey("_NET_WM_WINDOW_TYPE_DIALOG"));
62+
win->level=ABOVEALL;
63+
apc->LFSTK_addWindow(win,BOXLABEL);
5964
wc=apc->mainWindow;
6065

6166
label=new LFSTK_labelClass(wc,BOXLABEL,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
@@ -124,7 +129,6 @@ int main(int argc, char **argv)
124129
sy+=YSPACING;
125130

126131
wc->LFSTK_resizeWindow(DIALOGWIDTH,sy,true);
127-
//wc->LFSTK_showWindow();
128132

129133
printf("Number of gadgets in window=%i\n",wc->LFSTK_gadgetCount());
130134
int retval=apc->LFSTK_runApp();

‎LFSToolKit/examples/lineedit.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,15 @@ int main(int argc, char **argv)
7575
int sy=BORDER;
7676
std::vector<hitRect> hrs;
7777
LFSTK_ExpanderGadgetClass *multi=NULL;
78+
windowInitStruct *win;
7879

7980
apc=new LFSTK_applicationClass();
80-
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
81+
82+
win=apc->LFSTK_getDefaultWInit();
83+
win->windowName=BOXLABEL;
84+
win->windowType=win->app->appAtomsHashed.at(LFSTK_UtilityClass::LFSTK_hashFromKey("_NET_WM_WINDOW_TYPE_DIALOG"));
85+
win->level=ABOVEALL;
86+
apc->LFSTK_addWindow(win,BOXLABEL);
8187
wc=apc->mainWindow;
8288

8389
multi=new LFSTK_ExpanderGadgetClass(wc,"",0,0,DIALOGWIDTH,GADGETHITE*3);

0 commit comments

Comments
 (0)