Macintosh-Tools/mlvwm
1
0
Fork 0
mirror of https://github.com/morgant/mlvwm.git synced 2024-11-25 20:32:03 +00:00
Code Issues Projects Releases Wiki Activity

Borders: Fix stripes and whitespace around titlebar buttons & text

Browse Source
This commit is contained in:
TheMorc 2021-03-07 11:38:52 +01:00
parent 882e556d35
commit 9ea97d0641
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mlvwm/borders.c
View File

@ -334,7 +334,7 @@ void DrawCloseBox( MlvwmWindow *t, Bool on )
if( Scr.flags&SYSTEM8 ){ if( Scr.flags&SYSTEM8 ){
XFillRectangle( dpy, t->title_w, Scr.Gray4GC, XFillRectangle( dpy, t->title_w, Scr.Gray4GC,
4, (TITLE_HEIGHT-BOXSIZE)/2-2, 4, (TITLE_HEIGHT-BOXSIZE)/2-2,
BOXSIZE+7, BOXSIZE+2 ); BOXSIZE+2, BOXSIZE+2 );
FillGradation( t->close_b ); FillGradation( t->close_b );
} }
else{ else{
@ -376,7 +376,7 @@ void DrawMinMax( MlvwmWindow *t, Bool on )
if( on ){ if( on ){
if( Scr.flags&SYSTEM8 ){ if( Scr.flags&SYSTEM8 ){
XFillRectangle( dpy, t->title_w, Scr.Gray4GC, XFillRectangle( dpy, t->title_w, Scr.Gray4GC,
t->frame_w-BOXSIZE-15- t->frame_w-BOXSIZE-9-
(t->flags&SHADER?BOXSIZE+6:0), (t->flags&SHADER?BOXSIZE+6:0),
(TITLE_HEIGHT-BOXSIZE)/2-1, (TITLE_HEIGHT-BOXSIZE)/2-1,
BOXSIZE+8, BOXSIZE+2 ); BOXSIZE+8, BOXSIZE+2 );
@ -488,30 +488,20 @@ void SetTitleBar( MlvwmWindow *t, Bool on_off )
while( w+20>drawable && titlelength>0 ); while( w+20>drawable && titlelength>0 );
if( on_off ){ if( on_off ){
for( lp=4; lp<14; lp+=3 ){ for( lp=4; lp<16; lp+=2 ){
if( Scr.d_depth>1 ){ if( Scr.d_depth>1 ){
if( Scr.flags&SYSTEM8 ) if( Scr.flags&SYSTEM8 )
DrawShadowBox( 4, lp-2, t->frame_w-15, 2, t->title_w, 1, DrawShadowBox( 4, lp-1, t->frame_w-14, 2, t->title_w, 1,
Scr.WhiteGC, Scr.Gray1GC, SHADOW_ALL ); Scr.WhiteGC, Scr.Gray1GC, SHADOW_ALL );
else else
DrawShadowBox( 4, lp-1, t->frame_w-11, 2, t->title_w, 1, DrawShadowBox(0, lp, t->frame_w, 2, t->title_w, 1,
Scr.Gray1GC, Scr.WhiteGC, SHADOW_ALL ); Scr.Gray1GC, Scr.WhiteGC, SHADOW_ALL );
} }
else else
XDrawLine( dpy, t->title_w, Scr.BlackGC, XDrawLine( dpy, t->title_w, Scr.BlackGC,
4, lp-1, t->frame_w-7, lp-1 ); 4, lp-1, t->frame_w-7, lp-1 );
} }
if( Scr.d_depth>1 ){
if( Scr.flags&SYSTEM8 )
DrawShadowBox( 4, 14, t->frame_w-15, 2, t->title_w, 1,
Scr.WhiteGC, Scr.Gray1GC, SHADOW_ALL );
else
XDrawLine( dpy, t->title_w, Scr.Gray1GC,
4, 15, t->frame_w-9, 15 );
}
else
XDrawLine( dpy, t->title_w, Scr.BlackGC,
4, 15, t->frame_w-7, 15 );
if( Scr.flags&SYSTEM8 ){ if( Scr.flags&SYSTEM8 ){
DrawShadowBox( 0, 0, t->frame_w-2, TITLE_HEIGHT, t->title_w, DrawShadowBox( 0, 0, t->frame_w-2, TITLE_HEIGHT, t->title_w,
1, Scr.WhiteGC, Scr.Gray2GC, SHADOW_TOP ); 1, Scr.WhiteGC, Scr.Gray2GC, SHADOW_TOP );
@ -523,7 +513,7 @@ void SetTitleBar( MlvwmWindow *t, Bool on_off )
DrawShadowBox( 0, 0, t->frame_w-2, TITLE_HEIGHT, t->title_w, DrawShadowBox( 0, 0, t->frame_w-2, TITLE_HEIGHT, t->title_w,
1, Scr.WhiteGC, Scr.Gray2GC, SHADOW_ALL ); 1, Scr.WhiteGC, Scr.Gray2GC, SHADOW_ALL );
XFillRectangle( dpy, t->title_w, Scr.Gray4GC, XFillRectangle( dpy, t->title_w, Scr.Gray4GC,
(t->frame_w-w)/2-10, 1, w+20, TITLE_HEIGHT-2 ); (t->frame_w-w)/2-5, 1, w+10, TITLE_HEIGHT-2 );
dispgc = Scr.BlackGC; dispgc = Scr.BlackGC;
} }
else{ else{