From 33f62a7510e2b317a0304ffb3cbd9951b718c79b Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 2 Sep 2007 22:09:55 +0000
Subject: Cosmetics: set vo_hint.flags at more consistent places (directly
 before setting the corresponding values)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24331 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/x11_common.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'libvo')

diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 3a5a736ae9..8a8f9659c4 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -1179,7 +1179,7 @@ void vo_x11_nofs_sizepos(int x, int y, int width, int height)
 
 void vo_x11_sizehint(int x, int y, int width, int height, int max)
 {
-    vo_hint.flags = PPosition | PSize | PWinGravity;
+    vo_hint.flags = 0;
     if (vo_keepaspect)
     {
         vo_hint.flags |= PAspect;
@@ -1189,15 +1189,16 @@ void vo_x11_sizehint(int x, int y, int width, int height, int max)
         vo_hint.max_aspect.y = height;
     }
 
+    vo_hint.flags |= PPosition | PSize;
     vo_hint.x = x;
     vo_hint.y = y;
     vo_hint.width = width;
     vo_hint.height = height;
     if (max)
     {
+        vo_hint.flags |= PMaxSize;
         vo_hint.max_width = width;
         vo_hint.max_height = height;
-        vo_hint.flags |= PMaxSize;
     } else
     {
         vo_hint.max_width = 0;
@@ -1206,9 +1207,10 @@ void vo_x11_sizehint(int x, int y, int width, int height, int max)
 
     // Set minimum height/width to 4 to avoid off-by-one errors
     // and because mga_vid requires a minimal size of 4 pixels.
-    vo_hint.min_width = vo_hint.min_height = 4;
     vo_hint.flags |= PMinSize;
+    vo_hint.min_width = vo_hint.min_height = 4;
 
+    vo_hint.flags |= PWinGravity;
     vo_hint.win_gravity = StaticGravity;
     XSetWMNormalHints(mDisplay, vo_window, &vo_hint);
 }
-- 
cgit v1.2.3