Mercurial > mplayer.hg
diff Gui/wm/ws.c @ 1860:c65abbc91c5c
fix mwm bug's. faszom (C), and remove mixer.*
author | pontscho |
---|---|
date | Thu, 06 Sep 2001 09:36:48 +0000 |
parents | 88a88d0a3f94 |
children | 41ed89701ece |
line wrap: on
line diff
--- a/Gui/wm/ws.c Wed Sep 05 23:33:56 2001 +0000 +++ b/Gui/wm/ws.c Thu Sep 06 09:36:48 2001 +0000 @@ -374,15 +374,15 @@ win->SizeHint.y=win->Y; win->SizeHint.width=win->Width; win->SizeHint.height=win->Height; + if ( D & wsMinSize ) + { + win->SizeHint.flags|=PMinSize; + win->SizeHint.min_width=win->Width; + win->SizeHint.min_height=win->Height; + } if ( D & wsMaxSize ) { win->SizeHint.flags|=PMaxSize; - win->SizeHint.min_width=win->Width; - win->SizeHint.min_height=win->Height; - } - if ( D & wsMinSize ) - { - win->SizeHint.flags|=PMinSize; win->SizeHint.max_width=win->Width; win->SizeHint.max_height=win->Height; } @@ -613,7 +613,7 @@ case PropertyNotify: break; -// fprintf(stderr,"[ws] PropertyNotify %s\n",XGetAtomName( wsDisplay,Event->xproperty.atom ) ); + fprintf(stderr,"[ws] PropertyNotify %s\n",XGetAtomName( wsDisplay,Event->xproperty.atom ) ); if ( Event->xproperty.atom == wsWindowList[l]->AtomRemote ) { Atom type; @@ -709,18 +709,6 @@ win->Width=win->OldWidth; win->Height=win->OldHeight; win->isFullScreen=False; - if ( win->Property & wsMaxSize ) - { - win->SizeHint.flags|=PMaxSize; - win->SizeHint.max_width=win->Width; - win->SizeHint.max_height=win->Height; - } - if ( win->Property & wsMinSize ) - { - win->SizeHint.flags|=PMinSize; - win->SizeHint.min_width=win->Width; - win->SizeHint.min_height=win->Height; - } decoration=win->Decorations; wsScreenSaverOn( wsDisplay ); } @@ -731,18 +719,6 @@ win->X=0; win->Y=0; win->Width=wsMaxX; win->Height=wsMaxY; win->isFullScreen=True; -// if ( win->Property & wsMaxSize ) -// { -// win->SizeHint.flags|=PMaxSize; -// win->SizeHint.min_width=0; -// win->SizeHint.min_height=0; -// } -// if ( win->Property & wsMinSize ) -// { -// win->SizeHint.flags|=PMinSize; -// win->SizeHint.max_width=4096; -// win->SizeHint.max_height=4096; -// } wsScreenSaverOff( wsDisplay ); } @@ -751,6 +727,18 @@ win->SizeHint.y=win->Y; win->SizeHint.width=win->Width; win->SizeHint.height=win->Height; + if ( win->Property & wsMaxSize ) + { + win->SizeHint.flags|=PMaxSize; + win->SizeHint.max_width=win->Width; + win->SizeHint.max_height=win->Height; + } + if ( win->Property & wsMinSize ) + { + win->SizeHint.flags|=PMinSize; + win->SizeHint.min_width=win->Width; + win->SizeHint.min_height=win->Height; + } XSetWMNormalHints( wsDisplay,win->WindowID,&win->SizeHint ); XMoveResizeWindow( wsDisplay,win->WindowID,win->X,win->Y,win->Width,win->Height );