lfs/LFSDesktopProject
1
0
Fork 0
mirror of https://github.com/KeithDHedger/LFSDesktopProject.git synced 2026-01-29 14:42:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

added dock prefs dilaog

Browse Source
This commit is contained in:
K D Hedger
2023-11-25 18:13:48 +00:00
parent f6dc85e324
commit f70fea6923
8 changed files with 387 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LFSApplications/ChangeLog
View File

@ -1,4 +1,6 @@
0.2.0
Updated appearance dialog.
Added dock prefs dialog.
Updated prefs apps.
Updated lfscolourchooser to include alpha component.
Updated lfstkprefs.

13
LFSApplications/LFSApplications/app/Makefile.am
View File

@ -8,6 +8,7 @@ lfsbackdropprefs_SOURCES = ../src/lfsbackdropprefs.cpp
lfsdesktopprefs_SOURCES = ../src/lfsdesktopprefs.cpp
lfspanelprefs_SOURCES = ../src/lfspanelprefs.cpp
lfswm2prefs_SOURCES = ../src/lfswm2prefs.cpp
lfsdockprefs_SOURCES = ../src/lfsdockprefs.cpp
lfscolourchooser_SOURCES = ../src/lfscolourchooser.cpp
lfsabout_SOURCES = ../src/lfsabout.cpp
@ -17,16 +18,6 @@ lfsmimeeditor_SOURCES = ../src/lfsmimeeditor.cpp
lfswmprefs_SOURCES = ../src/lfswmprefs.cpp
man1_MANS = ../resources/man/lfsapplications.1
#bin_PROGRAMS = lfswmprefs
bin_PROGRAMS = lfstkprefs lfsappearance lfsbackdropprefs lfsdesktopprefs lfspanelprefs lfswm2prefs lfscolourchooser lfsabout lfsfontselect lfsruncommand lfsmimeeditor lfswmprefs
bin_PROGRAMS = lfstkprefs lfsappearance lfsbackdropprefs lfsdesktopprefs lfspanelprefs lfswm2prefs lfsdockprefs lfscolourchooser lfsabout lfsfontselect lfsruncommand lfsmimeeditor lfswmprefs

48
LFSApplications/LFSApplications/src/lfsappearance.cpp
View File

@ -37,29 +37,29 @@
#define BOXLABEL "LFS Appearance"
LFSTK_applicationClass *apc=NULL;
LFSTK_windowClass *wc=NULL;
LFSTK_labelClass *personal=NULL;
LFSTK_labelClass *copyrite=NULL;
LFSTK_buttonClass *seperator=NULL;
LFSTK_buttonClass *quit=NULL;
LFSTK_buttonClass *apply=NULL;
LFSTK_buttonClass *update=NULL;
LFSTK_applicationClass *apc=NULL;
LFSTK_windowClass *wc=NULL;
LFSTK_labelClass *personal=NULL;
LFSTK_labelClass *copyrite=NULL;
LFSTK_buttonClass *seperator=NULL;
LFSTK_buttonClass *quit=NULL;
LFSTK_buttonClass *apply=NULL;
LFSTK_buttonClass *update=NULL;
LFSTK_buttonClass *launchButton=NULL;
LFSTK_labelClass *launchLabel=NULL;
LFSTK_buttonClass *launchButton=NULL;
LFSTK_labelClass *launchLabel=NULL;
LFSTK_menuClass *setMenu=NULL;
LFSTK_buttonClass *loadSet=NULL;
LFSTK_lineEditClass *currentSet=NULL;
LFSTK_menuClass *setMenu=NULL;
LFSTK_buttonClass *loadSet=NULL;
LFSTK_lineEditClass *currentSet=NULL;
LFSTK_lineEditClass *key=NULL;
LFSTK_lineEditClass *key=NULL;
LFSTK_ExpanderGadgetClass *multi=NULL;
int queueID=-1;
int queueID=-1;
menuStruct **groupNameMenuItems=NULL;
LFSTK_findClass *find;
menuStruct **groupNameMenuItems=NULL;
LFSTK_findClass *find;
bool doQuit(void *p,void* ud)
{
@ -193,6 +193,12 @@ bool buttonCB(void *p,void* ud)
system(command);
free(command);
}
if(strcmp((char*)ud,"DOCKPREFS")==0)
{
asprintf(&command,"%slfsdockprefs &",libpath,wc->window);
system(command);
free(command);
}
if(strcmp((char*)ud,"UPDATE")==0)
{
makeGroup(currentSet->LFSTK_getCStr());
@ -353,6 +359,14 @@ int main(int argc, char **argv)
hrs.push_back({BORDER*2+GADGETWIDTH,sy,LABELWIDTH,GADGETHITE,launchLabel});
sy+=YSPACING;
//dock
launchButton=new LFSTK_buttonClass(wc,"Dock Prefs",BORDER,sy,GADGETWIDTH,GADGETHITE,BUTTONGRAV);
launchButton->LFSTK_setMouseCallBack(NULL,buttonCB,(void*)"DOCKPREFS");
hrs.push_back({BORDER,sy,GADGETWIDTH,GADGETHITE,launchButton});
launchLabel=new LFSTK_labelClass(wc,"Launch Dock Prefs Dialog",BORDER*2+GADGETWIDTH,sy,LABELWIDTH,GADGETHITE,LEFT);
hrs.push_back({BORDER*2+GADGETWIDTH,sy,LABELWIDTH,GADGETHITE,launchLabel});
sy+=YSPACING;
//load set
loadSet=new LFSTK_buttonClass(wc,"Load Set",BORDER,sy,GADGETWIDTH,GADGETHITE,BUTTONGRAV);
loadSet->LFSTK_setMouseCallBack(NULL,buttonCB,(void*)"SHOWGROUPS");

349
LFSApplications/LFSApplications/src/lfsdockprefs.cpp Normal file
View File

@ -0,0 +1,349 @@
/*
*
* ©K. D. Hedger. Sat 25 Nov 17:33:52 GMT 2023 keithdhedger@gmail.com
* This file (lfsdockprefs.cpp) is part of LFSApplications.
* LFSApplications is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* LFSApplications is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with LFSApplications. If not, see <http://www.gnu.org/licenses/>.
*/
#include <string>
#include <getopt.h>
#include "lfstk/LFSTKGlobals.h"
#undef GADGETWIDTH
#define GADGETWIDTH 128
#undef DIALOGWIDTH
#define DIALOGWIDTH (GADGETWIDTH*3)+(BORDER*3)
#define BOXLABEL "LFS Dock Prefs"
LFSTK_applicationClass *apc=NULL;
LFSTK_prefsClass prefs;
LFSTK_windowClass *wc=NULL;
LFSTK_labelClass *label=NULL;
LFSTK_labelClass *personal=NULL;
LFSTK_labelClass *copyrite=NULL;
LFSTK_buttonClass *seperator=NULL;
LFSTK_buttonClass *quit=NULL;
LFSTK_buttonClass *apply=NULL;
//panel data
LFSTK_buttonClass *dockSize=NULL;
LFSTK_lineEditClass *dockSizeEdit=NULL;
menuStruct **dockSizeMenuckGrav=NULL;
LFSTK_menuClass *sizeMenu=NULL;
LFSTK_buttonClass *dockGrav=NULL;
LFSTK_lineEditClass *dockGravEdit=NULL;
menuStruct **dockGravMenu=NULL;
LFSTK_menuClass *gravMenu=NULL;
LFSTK_lineEditClass *dockOnMonitor=NULL;
LFSTK_lineEditClass *dockGadgets=NULL;
LFSTK_lineEditClass *dockBGColourEdit=NULL;
LFSTK_lineEditClass *dockTextColourEdit=NULL;
std::map<int,const char*> dockGravConvertToStr={{1,"North"},{2,"South"}};
std::map<int,const char*> dockSizeConvertToStr={{1,"Small"},{2,"Medium"},{3,"Large"},{4,"Huge"}};
//action data
LFSTK_lineEditClass *termCommand=NULL;
//font
LFSTK_fontDialogClass *fontDialogButton=NULL;
LFSTK_lineEditClass *fontEdit=NULL;
int dockGravityPref=2;
int dockSizePref=3;
bool doQuit(void *p,void* ud)
{
apc->exitValue=0;
apc->mainLoop=false;
return(false);
}
bool buttonCB(void *p,void* ud)
{
const fontDataStruct *fd;
if(ud!=NULL)
{
if(strcmp((char*)ud,"SHOWGRAVMENU")==0)
gravMenu->LFSTK_showMenu();
if(strcmp((char*)ud,"SHOWSIZEMENU")==0)
sizeMenu->LFSTK_showMenu();
if(strcmp((char*)ud,"SELECTFONT")==0)
{
fontDialogButton->LFSTK_showDialog(fontEdit->LFSTK_getCStr());
fd=fontDialogButton->LFSTK_getFontData(false);
if(fd->isValid==true)
fontEdit->LFSTK_setBuffer(fd->fontString);
return(true);
}
}
return(true);
}
void getEdits(void)
{
prefs.prefsMap=
{
{prefs.LFSTK_hashFromKey("onmonitor"),{TYPEINT,"onmonitor","",false,atoi(dockOnMonitor->LFSTK_getCStr())}},
{prefs.LFSTK_hashFromKey("panelgrav"),{TYPEINT,"panelgrav","",false,dockGravityPref}},
{prefs.LFSTK_hashFromKey("panelsize"),{TYPEINT,"panelsize","",false,dockSizePref}},
{prefs.LFSTK_hashFromKey("panelbgcolour"),{TYPESTRING,"panelbgcolour",dockBGColourEdit->LFSTK_getCStr(),false,0}},
{prefs.LFSTK_hashFromKey("textcolour"),{TYPESTRING,"textcolour",dockTextColourEdit->LFSTK_getCStr(),false,0}},
{prefs.LFSTK_hashFromKey("gadgetsleft"),{TYPESTRING,"gadgetsleft",dockGadgets->LFSTK_getCStr(),false,0}},
{prefs.LFSTK_hashFromKey("termcommand"),{TYPESTRING,"termcommand",termCommand->LFSTK_getCStr(),false,0}},
{prefs.LFSTK_hashFromKey("font"),{TYPESTRING,"font",fontEdit->LFSTK_getCStr(),false,0}},
};
}
bool applyCB(void *p,void* ud)
{
std::map<int,const char*>::const_iterator it;
std::string prefsfile;
if(ud!=NULL)
{
//panel grav
if(isdigit(dockGravEdit->LFSTK_getCStr()[0])==true)
dockGravityPref=atoi(dockGravEdit->LFSTK_getCStr());
else
{
for(it=dockGravConvertToStr.begin();it != dockGravConvertToStr.end();++it)
{
if((it->second!=NULL) && (strcmp(it->second,dockGravEdit->LFSTK_getCStr())==0))
{
dockGravityPref=it->first;
break;
}
}
}
//panel size
if(isdigit(dockSizeEdit->LFSTK_getCStr()[0])==true)
dockSizePref=atoi(dockSizeEdit->LFSTK_getCStr());
else
{
for(it=dockSizeConvertToStr.begin();it != dockSizeConvertToStr.end();++it)
{
if((it->second!=NULL) && (strcmp(it->second,dockSizeEdit->LFSTK_getCStr())==0))
{
dockSizePref=it->first;
break;
}
}
}
getEdits();
prefsfile=apc->configDir+std::string("/lfsdock.rc");
prefs.LFSTK_saveVarsToFile(prefsfile.c_str());
//prefs.LFSTK_saveVarsToFile("-");
}
return(true);
}
void setEdits(void)
{
dockSizeEdit->LFSTK_setBuffer(dockSizeConvertToStr[prefs.LFSTK_getInt("panelsize")]);
dockGravEdit->LFSTK_setBuffer(dockGravConvertToStr[prefs.LFSTK_getInt("panelgrav")]);
dockOnMonitor->LFSTK_setBuffer(std::to_string(prefs.LFSTK_getInt("onmonitor")).c_str());
termCommand->LFSTK_setBuffer(prefs.LFSTK_getCString("termcommand"));
dockGadgets->LFSTK_setBuffer(prefs.LFSTK_getCString("gadgetsleft"));
dockBGColourEdit->LFSTK_setBuffer(prefs.LFSTK_getCString("panelbgcolour"));
dockTextColourEdit->LFSTK_setBuffer(prefs.LFSTK_getCString("textcolour"));
fontEdit->LFSTK_setBuffer(prefs.LFSTK_getCString("font"));
}
void getPrefs(void)
{
char *env=NULL;
prefs.prefsMap=
{
{prefs.LFSTK_hashFromKey("panelsize"),{TYPEINT,"panelsize","",false,3}},
{prefs.LFSTK_hashFromKey("onmonitor"),{TYPEINT,"onmonitor","",false,0}},
{prefs.LFSTK_hashFromKey("panelgrav"),{TYPEINT,"panelgrav","",false,2}},
{prefs.LFSTK_hashFromKey("termcommand"),{TYPESTRING,"termcommand","kkterminal -m -l -e ",false,0}},
{prefs.LFSTK_hashFromKey("gadgetsleft"),{TYPESTRING,"gadgetsleft","LCSD",false,0}},
{prefs.LFSTK_hashFromKey("panelbgcolour"),{TYPESTRING,"panelbgcolour","#00000000",false,0}},
{prefs.LFSTK_hashFromKey("textcolour"),{TYPESTRING,"textcolour","black",false,0}},
{prefs.LFSTK_hashFromKey("font"),{TYPESTRING,"font","Liberation Mono:size=12",false,0}},
};
asprintf(&env,"%s/lfsdock.rc",apc->configDir.c_str());
prefs.LFSTK_loadVarsFromFile(env);
free(env);
}
bool panelGravCB(void *p,void* ud)
{
static_cast<LFSTK_gadgetClass*>(p)->wc->LFSTK_hideWindow();
dockGravEdit->LFSTK_setBuffer(dockGravConvertToStr[(int)(long)ud]);
return(true);
}
bool panelSizeCB(void *p,void* ud)
{
static_cast<LFSTK_gadgetClass*>(p)->wc->LFSTK_hideWindow();
dockSizeEdit->LFSTK_setBuffer(dockSizeConvertToStr[(int)(long)ud]);
return(true);
}
int main(int argc, char **argv)
{
int sy=0;
int parentWindow=-1;
int c=0;
int option_index=0;
const char *shortOpts="h?w:";
option longOptions[]=
{
{"window",1,0,'w'},
{"help",0,0,'h'},
{0, 0, 0, 0}
};
while(1)
{
option_index=0;
c=getopt_long_only(argc,argv,shortOpts,longOptions,&option_index);
if (c==-1)
break;
switch (c)
{
case 'h':
case '?':
printf("-?,-h,--help\t\tPrint this help\n");
printf("-w,--window\t\tSet transient for window\n");
exit(0);
case 'w':
parentWindow=atoi(optarg);
break;
}
}
apc=new LFSTK_applicationClass();
apc->LFSTK_addWindow(NULL,BOXLABEL);
wc=apc->mainWindow;
copyrite=new LFSTK_labelClass(wc,COPYRITE,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
sy+=HALFYSPACING;
personal=new LFSTK_labelClass(wc,PERSONAL,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
personal->LFSTK_setCairoFontDataParts("B");
sy+=YSPACING;
//do prefs
getPrefs();
//size
dockSize=new LFSTK_buttonClass(wc,"Panel Size",BORDER,sy,GADGETWIDTH,GADGETHITE,BUTTONGRAV);
dockSize->LFSTK_setIndicator(DISCLOSURE);
dockSize->LFSTK_setMouseCallBack(NULL,buttonCB,(void*)"SHOWSIZEMENU");
dockSizeMenuckGrav=new menuStruct*[4];
for(long j=0;j<4;j++)
{
dockSizeMenuckGrav[j]=new menuStruct;
dockSizeMenuckGrav[j]->label=strdup(dockSizeConvertToStr[j+1]);
dockSizeMenuckGrav[j]->userData=(void*)(j+1);
}
sizeMenu=new LFSTK_menuClass(wc,BORDER+GADGETWIDTH,sy,1,1);
sizeMenu->LFSTK_setMouseCallBack(NULL,panelSizeCB,NULL);
sizeMenu->LFSTK_addMainMenus(dockSizeMenuckGrav,4);
dockSizeEdit=new LFSTK_lineEditClass(wc,"",BORDER+GADGETWIDTH+BORDER,sy,GADGETWIDTH*2,GADGETHITE,BUTTONGRAV);
sy+=YSPACING;
//panel grav
dockGrav=new LFSTK_buttonClass(wc,"Panel Gravity",BORDER,sy,GADGETWIDTH,GADGETHITE,BUTTONGRAV);
dockGrav->LFSTK_setIndicator(DISCLOSURE);
dockGrav->LFSTK_setMouseCallBack(NULL,buttonCB,(void*)"SHOWGRAVMENU");
dockGravMenu=new menuStruct*[4];
for(long j=0;j<2;j++)
{
dockGravMenu[j]=new menuStruct;
dockGravMenu[j]->label=strdup(dockGravConvertToStr[j+1]);
dockGravMenu[j]->userData=(void*)(j+1);
}
gravMenu=new LFSTK_menuClass(wc,BORDER+GADGETWIDTH,sy,1,1);
gravMenu->LFSTK_setMouseCallBack(NULL,panelGravCB,NULL);
gravMenu->LFSTK_addMainMenus(dockGravMenu,2);
dockGravEdit=new LFSTK_lineEditClass(wc,"",BORDER+GADGETWIDTH+BORDER,sy,GADGETWIDTH*2,GADGETHITE,BUTTONGRAV);
sy+=YSPACING;
//font
fontDialogButton=new LFSTK_fontDialogClass(wc,"Dock Font",BORDER,sy,GADGETWIDTH,GADGETHITE,BUTTONGRAV);
fontDialogButton->LFSTK_setMouseCallBack(NULL,buttonCB,(void*)"SELECTFONT");
fontEdit=new LFSTK_lineEditClass(wc,apc->globalLib->LFSTK_getGlobalString(0,TYPEFONT),BORDER+GADGETWIDTH+BORDER,sy,GADGETWIDTH*2,GADGETHITE,BUTTONGRAV);
sy+=YSPACING;
//panel colour
label=new LFSTK_labelClass(wc,"Panel Colour",BORDER,sy,GADGETWIDTH,GADGETHITE,LEFT);
dockBGColourEdit=new LFSTK_lineEditClass(wc,"",BORDER+GADGETWIDTH+BORDER,sy,GADGETWIDTH*2,GADGETHITE,BUTTONGRAV);
sy+=YSPACING;
//panel text colour
label=new LFSTK_labelClass(wc,"Text Colour",BORDER,sy,GADGETWIDTH,GADGETHITE,LEFT);
dockTextColourEdit=new LFSTK_lineEditClass(wc,"black",BORDER+GADGETWIDTH+BORDER,sy,GADGETWIDTH*2,GADGETHITE,BUTTONGRAV);
sy+=YSPACING;
//on monitor
label=new LFSTK_labelClass(wc,"On Monitor",BORDER,sy,GADGETWIDTH,GADGETHITE,LEFT);
dockOnMonitor=new LFSTK_lineEditClass(wc,"",BORDER+GADGETWIDTH+BORDER,sy,GADGETWIDTH*2,GADGETHITE,BUTTONGRAV);
sy+=YSPACING;
//term comm
label=new LFSTK_labelClass(wc,"Terminal CMD",BORDER,sy,GADGETWIDTH,GADGETHITE,LEFT);
termCommand=new LFSTK_lineEditClass(wc,"",BORDER+GADGETWIDTH+BORDER,sy,GADGETWIDTH*2,GADGETHITE,BUTTONGRAV);
sy+=YSPACING;
//left gadgets
label=new LFSTK_labelClass(wc,"Gadgets",BORDER,sy,GADGETWIDTH,GADGETHITE,LEFT);
dockGadgets=new LFSTK_lineEditClass(wc,"",BORDER+GADGETWIDTH+BORDER,sy,GADGETWIDTH*2,GADGETHITE,BUTTONGRAV);
sy+=YSPACING;
setEdits();
//line
seperator=new LFSTK_buttonClass(wc,"--",0,sy,DIALOGWIDTH,GADGETHITE,BUTTONGRAV);
seperator->LFSTK_setStyle(BEVELNONE);
seperator->gadgetDetails.buttonTile=false;
seperator->gadgetDetails.colour=&wc->windowColourNames[NORMALCOLOUR];
sy+=YSPACING;
//quit
quit=new LFSTK_buttonClass(wc,"Quit",BORDER,sy,GADGETWIDTH,GADGETHITE,BUTTONGRAV);
quit->LFSTK_setMouseCallBack(NULL,doQuit,NULL);
//apply
apply=new LFSTK_buttonClass(wc,"Apply",DIALOGWIDTH-BORDER-GADGETWIDTH,sy,GADGETWIDTH,GADGETHITE,BUTTONGRAV);
apply->LFSTK_setMouseCallBack(NULL,applyCB,(void*)"APPLY");
sy+=YSPACING;
wc->LFSTK_resizeWindow(DIALOGWIDTH,sy,true);
wc->LFSTK_showWindow();
wc->LFSTK_setKeepAbove(true);
if(parentWindow!=-1)
wc->LFSTK_setTransientFor(parentWindow);
int retval=apc->LFSTK_runApp();
delete gravMenu;
delete sizeMenu;
delete apc;
return(retval);
}

2
LFSDock/LFSDock/src/globals.cpp
View File

@ -32,10 +32,8 @@ int iconSize=16;
int posMultiplier=1;
int panelSize=2;
int panelWidth=-1;
const monitorStruct *mons=NULL;
int onMonitor=0;
int panelPos=PANELCENTRE;
int panelGravity=PANELNORTH;
const char *panelTextColour="";
const char *panelBGColour="";

2
LFSDock/LFSDock/src/globals.h
View File

@ -71,10 +71,8 @@ extern int iconSize;
extern int posMultiplier;
extern int panelSize;
extern int panelWidth;
extern const monitorStruct *mons;
extern int onMonitor;
extern int panelPos;
extern int panelGravity;
extern const char *panelTextColour;
extern const char *panelBGColour;

36
LFSDock/LFSDock/src/main.cpp
View File

@ -37,9 +37,7 @@ void loadPrefs(const char *env)
{
prefs.LFSTK_loadVarsFromFile(env);
panelSize=prefs.LFSTK_getInt(prefs.LFSTK_hashFromKey("panelsize"));
panelWidth=prefs.LFSTK_getInt(prefs.LFSTK_hashFromKey("panelwidth"));
onMonitor=prefs.LFSTK_getInt(prefs.LFSTK_hashFromKey("onmonitor"));
panelPos=prefs.LFSTK_getInt(prefs.LFSTK_hashFromKey("panelpos"));
panelGravity=prefs.LFSTK_getInt(prefs.LFSTK_hashFromKey("panelgrav"));
panelTextColour=prefs.LFSTK_getCString(prefs.LFSTK_hashFromKey("textcolour"));
panelBGColour=prefs.LFSTK_getCString(prefs.LFSTK_hashFromKey("panelbgcolour"));
@ -154,14 +152,9 @@ int main(int argc,char **argv)
prefs.prefsMap={
{prefs.LFSTK_hashFromKey("panelsize"),{TYPEINT,"panelsize","",false,1}},
{prefs.LFSTK_hashFromKey("panelwidth"),{TYPEINT,"panelwidth","",false,0}},
{prefs.LFSTK_hashFromKey("onmonitor"),{TYPEINT,"onmonitor","",false,0}},
{prefs.LFSTK_hashFromKey("panelpos"),{TYPEINT,"panelpos","",false,0}},
{prefs.LFSTK_hashFromKey("panelgrav"),{TYPEINT,"panelgrav","",false,0}},
{prefs.LFSTK_hashFromKey("textcolour"),{TYPESTRING,"textcolour","black",false,0}},
{prefs.LFSTK_hashFromKey("termcommand"),{TYPESTRING,"termcommand","xterm -e ",false,0}},
{prefs.LFSTK_hashFromKey("gadgetsleft"),{TYPESTRING,"gadgetsleft","l",false,0}},
{prefs.LFSTK_hashFromKey("font"),{TYPESTRING,"font","",false,0}},
@ -173,7 +166,6 @@ int main(int argc,char **argv)
while(realMainLoop==true)
{
panelPos=PANELCENTRE;
apc=new LFSTK_applicationClass();
apc->LFSTK_addWindow(NULL,NULL);
@ -246,35 +238,11 @@ int main(int argc,char **argv)
case PANELSOUTH:
py=mons->y+mons->h-iconSize;
case PANELNORTH:
switch(panelWidth)
{
case PANELFULL:
panelWidth=mons->w;
panelPos=PANELLEFT;
break;
case PANELSHRINK:
panelWidth=psize;
break;
}
switch(panelPos)
{
case PANELLEFT:
px=mons->x;
break;
case PANELCENTRE:
px=((mons->w/2)-(psize/2))+mons->x;
break;
case PANELRIGHT:
px=mons->x+mons->w-psize;
break;
default:
px=panelPos;
break;
}
px=((mons->w/2)-(psize/2))+mons->x;
break;
}
mainwind->LFSTK_resizeWindow(panelWidth,iconSize+extraSpace,true);
mainwind->LFSTK_resizeWindow(psize,iconSize+extraSpace,true);
if(posMultiplier==1)
mainwind->LFSTK_moveWindow(px,py-extraSpace,true);
else

2
LFSToolKit/LFSToolKit/lfstk/LFSTKLineEdit.h
View File

@ -40,7 +40,7 @@ class LFSTK_lineEditClass : public LFSTK_gadgetClass
void LFSTK_clearWindow(void);
void LFSTK_resizeWindow(int w,int h);
std::string LFSTK_getBuffer(void);
std::string LFSTK_getBuffer(void);
void LFSTK_setBuffer(const char *str);
const char *LFSTK_getCStr(void);