gui fixws for lfswm2

This commit is contained in:
K D Hedger
2024-06-08 15:17:19 +01:00
parent 74a3108ae0
commit 46df4e6bf0
4 changed files with 19 additions and 18 deletions

View File

@ -1,4 +1,5 @@
1.0.1
Fixed left/right side window resize draggers AGAIN!.
Fixed hiding/showing utility windows.
Fixed left/right side window resize draggers.
Fixed utility windows.

View File

@ -929,9 +929,9 @@ void LFSWM2_clientClass::LFSWM2_resizeControls(void)
if(this->isBorderless==true)
return;
XResizeWindow(this->mainClass->display,this->bottomDragger,this->frameWindowRect.w,this->dragsize);
XResizeWindow(this->mainClass->display,this->leftSideDragger,this->dragsize,this->frameWindowRect.h-(this->dragsize*2));
XResizeWindow(this->mainClass->display,this->rightSideDragger,this->dragsize,this->frameWindowRect.h-(this->dragsize*2));
XResizeWindow(this->mainClass->display,this->bottomDragger,this->frameWindowRect.w,this->dragSpacing);
XResizeWindow(this->mainClass->display,this->leftSideDragger,this->leftSideDragWidth,this->frameWindowRect.h-(this->dragSpacing*2));
XResizeWindow(this->mainClass->display,this->rightSideDragger,this->riteSideDragWidth,this->frameWindowRect.h-(this->dragSpacing*2));
}
void LFSWM2_clientClass::LFSWM2_setWMState()

View File

@ -137,7 +137,9 @@ class LFSWM2_clientClass
void LFSWM2_unSpecial(void);
int dragsize=16;
int dragSpacing=16;
int leftSideDragWidth=1;
int riteSideDragWidth=1;
int smoothness=4;//TODO//
int controlCnt=0;
int minWidth;

View File

@ -420,64 +420,62 @@ bool bh=false;
cc->setWindowRects(false);
if(cc->canResize==true)
{
int drwid;
int dlwid;
if(this->mainClass->useTheme==true)
{
drwid=this->theme.leftWidth;
dlwid=this->theme.rightWidth;
cc->leftSideDragWidth=this->theme.leftWidth;
cc->riteSideDragWidth=this->theme.rightWidth;
}
else
{
drwid=this->mainClass->leftSideBarSize;
dlwid=this->mainClass->riteSideBarSize;
cc->leftSideDragWidth=this->mainClass->leftSideBarSize;
cc->riteSideDragWidth=this->mainClass->riteSideBarSize;
}
//top left dragger
wa.win_gravity=NorthWestGravity;
wa.cursor=this->mainClass->topLeftCursor;
cc->topLeftDragger=XCreateWindow(this->mainClass->display,cc->frameWindow,0,0,cc->dragsize,cc->dragsize,0,CopyFromParent,InputOnly,CopyFromParent,CWWinGravity| CWCursor,&wa);
cc->topLeftDragger=XCreateWindow(this->mainClass->display,cc->frameWindow,0,0,cc->dragSpacing,cc->dragSpacing,0,CopyFromParent,InputOnly,CopyFromParent,CWWinGravity| CWCursor,&wa);
XSelectInput(this->mainClass->display,cc->topLeftDragger,ButtonPressMask|PointerMotionMask|ButtonReleaseMask);
//top righht dragger
wa.win_gravity=NorthEastGravity;
wa.cursor=this->mainClass->topRightCursor;
cc->topRightDragger=XCreateWindow(this->mainClass->display,cc->frameWindow,cc->frameWindowRect.w-cc->dragsize,0,cc->dragsize,cc->dragsize,0,CopyFromParent,InputOnly,CopyFromParent,CWWinGravity| CWCursor,&wa);
cc->topRightDragger=XCreateWindow(this->mainClass->display,cc->frameWindow,cc->frameWindowRect.w-cc->dragSpacing,0,cc->dragSpacing,cc->dragSpacing,0,CopyFromParent,InputOnly,CopyFromParent,CWWinGravity| CWCursor,&wa);
XSelectInput(this->mainClass->display,cc->topRightDragger,ButtonPressMask|PointerMotionMask|ButtonReleaseMask);
//bottom dragger
wa.win_gravity=SouthWestGravity;
wa.cursor=this->mainClass->bottomCursor;
cc->bottomDragger=XCreateWindow(this->mainClass->display,cc->frameWindow,0,cc->frameWindowRect.h-cc->dragsize,cc->frameWindowRect.w,cc->dragsize,0,CopyFromParent,InputOnly,CopyFromParent,CWWinGravity| CWCursor,&wa);
cc->bottomDragger=XCreateWindow(this->mainClass->display,cc->frameWindow,0,cc->frameWindowRect.h-cc->dragSpacing,cc->frameWindowRect.w,cc->dragSpacing,0,CopyFromParent,InputOnly,CopyFromParent,CWWinGravity| CWCursor,&wa);
XSelectInput(this->mainClass->display,cc->bottomDragger,ButtonPressMask|PointerMotionMask|ButtonReleaseMask);
//left side dragger
wa.win_gravity=NorthWestGravity;
wa.cursor=this->mainClass->leftCursor;
cc->leftSideDragger=XCreateWindow(this->mainClass->display,cc->frameWindow,0,cc->dragsize,dlwid,cc->frameWindowRect.h-(cc->dragsize*2),0,CopyFromParent,InputOnly,CopyFromParent,CWWinGravity| CWCursor,&wa);
cc->leftSideDragger=XCreateWindow(this->mainClass->display,cc->frameWindow,0,cc->dragSpacing,cc->leftSideDragWidth,cc->frameWindowRect.h-(cc->dragSpacing*2),0,CopyFromParent,InputOnly,CopyFromParent,CWWinGravity| CWCursor,&wa);
XSelectInput(this->mainClass->display,cc->leftSideDragger,ButtonPressMask|PointerMotionMask|ButtonReleaseMask);
//right side dragger
wa.win_gravity=NorthEastGravity;
wa.cursor=this->mainClass->rightCursor;
cc->rightSideDragger=XCreateWindow(this->mainClass->display,cc->frameWindow,cc->frameWindowRect.w-dlwid,cc->dragsize,drwid,cc->frameWindowRect.h-(cc->dragsize*2),0,CopyFromParent,InputOnly,CopyFromParent,CWWinGravity| CWCursor,&wa);
cc->rightSideDragger=XCreateWindow(this->mainClass->display,cc->frameWindow,cc->frameWindowRect.w-cc->riteSideDragWidth,cc->dragSpacing,cc->riteSideDragWidth,cc->frameWindowRect.h-(cc->dragSpacing*2),0,CopyFromParent,InputOnly,CopyFromParent,CWWinGravity| CWCursor,&wa);
XSelectInput(this->mainClass->display,cc->rightSideDragger,ButtonPressMask|PointerMotionMask|ButtonReleaseMask);
//bottom rite dragger
wa.win_gravity=SouthEastGravity;
wa.cursor=this->mainClass->bottomRightCursor;
cc->bottomRightDragger=XCreateWindow(this->mainClass->display,cc->frameWindow,cc->frameWindowRect.w-cc->dragsize,cc->frameWindowRect.h-cc->dragsize,cc->dragsize,cc->dragsize,0,CopyFromParent,InputOnly,CopyFromParent,CWWinGravity| CWCursor,&wa);
cc->bottomRightDragger=XCreateWindow(this->mainClass->display,cc->frameWindow,cc->frameWindowRect.w-cc->dragSpacing,cc->frameWindowRect.h-cc->dragSpacing,cc->dragSpacing,cc->dragSpacing,0,CopyFromParent,InputOnly,CopyFromParent,CWWinGravity| CWCursor,&wa);
XSelectInput(this->mainClass->display,cc->bottomRightDragger,ButtonPressMask|PointerMotionMask|ButtonReleaseMask);
//bottom left dragger
wa.win_gravity=SouthWestGravity;
wa.cursor=this->mainClass->bottomLeftCursor;
cc->bottomLeftDragger=XCreateWindow(this->mainClass->display,cc->frameWindow,0,cc->frameWindowRect.h-cc->dragsize,cc->dragsize,cc->dragsize,0,CopyFromParent,InputOnly,CopyFromParent,CWWinGravity| CWCursor,&wa);
cc->bottomLeftDragger=XCreateWindow(this->mainClass->display,cc->frameWindow,0,cc->frameWindowRect.h-cc->dragSpacing,cc->dragSpacing,cc->dragSpacing,0,CopyFromParent,InputOnly,CopyFromParent,CWWinGravity| CWCursor,&wa);
XSelectInput(this->mainClass->display,cc->bottomLeftDragger,ButtonPressMask|PointerMotionMask|ButtonReleaseMask);
}