diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-09-06 09:36:48 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-09-06 09:36:48 +0000 |
commit | d2f5c270fdb4acf512d04a2827e394db7670a850 (patch) | |
tree | 2d33d69a9ad3fdb5442be40c6f7a3075daa86371 /Gui/wm | |
parent | 2b15d7ecc1f5059576bbbf7147979f9665681df2 (diff) | |
download | mpv-d2f5c270fdb4acf512d04a2827e394db7670a850.tar.bz2 mpv-d2f5c270fdb4acf512d04a2827e394db7670a850.tar.xz |
fix mwm bug's. faszom (C), and remove mixer.*
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1861 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/wm')
-rw-r--r-- | Gui/wm/ws.c | 46 |
1 files changed, 17 insertions, 29 deletions
diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c index aed376d2d9..621f652b11 100644 --- a/Gui/wm/ws.c +++ b/Gui/wm/ws.c @@ -374,15 +374,15 @@ void wsCreateWindow( wsTWindow * win,int X,int Y,int wX,int hY,int bW,int cV,uns win->SizeHint.y=win->Y; win->SizeHint.width=win->Width; win->SizeHint.height=win->Height; - if ( D & wsMaxSize ) + if ( D & wsMinSize ) { - win->SizeHint.flags|=PMaxSize; + win->SizeHint.flags|=PMinSize; win->SizeHint.min_width=win->Width; win->SizeHint.min_height=win->Height; } - if ( D & wsMinSize ) + if ( D & wsMaxSize ) { - win->SizeHint.flags|=PMinSize; + win->SizeHint.flags|=PMaxSize; win->SizeHint.max_width=win->Width; win->SizeHint.max_height=win->Height; } @@ -613,7 +613,7 @@ buttonreleased: 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 @@ void wsFullScreen( wsTWindow * win ) 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 @@ void wsFullScreen( wsTWindow * win ) 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 @@ void wsFullScreen( wsTWindow * win ) 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 ); |