[MPlayer-cvslog] r33305 - in trunk: DOCS/xml/de/skin.xml DOCS/xml/en/skin.xml gui/app.c gui/cfg.c gui/interface.c

[ib]

Author: ib
Date: Sat Apr 23 10:05:27 2011
New Revision: 33305

Log:
Position windows initially at coordinates given in skin file.

So far, the initial positions of the main and subwindow were not
the ones specified in the skin file, but fixed defaults.

Modified:
   trunk/gui/app.c
   trunk/gui/cfg.c
   trunk/gui/interface.c

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/xml/de/skin.xml
   trunk/DOCS/xml/en/skin.xml

Modified: trunk/gui/app.c
==============================================================================
--- trunk/gui/app.c	Sat Apr 23 05:32:34 2011	(r33304)
+++ trunk/gui/app.c	Sat Apr 23 10:05:27 2011	(r33305)
@@ -89,9 +89,6 @@ void appInitStruct(void)
     appMPlayer.IndexOfMainItems = -1;
     appMPlayer.IndexOfBarItems  = -1;
     appMPlayer.IndexOfMenuItems = -1;
-
-    appMPlayer.sub.x = -1;   // NOTE TO MYSELF: is this really necessary?
-    appMPlayer.sub.y = -1;   // NOTE TO MYSELF: is this really necessary?
 }
 
 void appFreeStruct(void)

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Sat Apr 23 05:32:34 2011	(r33304)
+++ trunk/gui/cfg.c	Sat Apr 23 10:05:27 2011	(r33305)
@@ -91,10 +91,10 @@ int gtkLoadFullscreen  = 0;
 int gtkShowVideoWindow = 1;
 
 int gui_save_pos   = 1;
-int gui_main_pos_x = -2;
-int gui_main_pos_y = -2;
-int gui_sub_pos_x  = -1;
-int gui_sub_pos_y  = -1;
+int gui_main_pos_x = -3;
+int gui_main_pos_y = -3;
+int gui_sub_pos_x  = -3;
+int gui_sub_pos_y  = -3;
 
 static m_config_t *gui_conf;
 

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Sat Apr 23 05:32:34 2011	(r33304)
+++ trunk/gui/interface.c	Sat Apr 23 10:05:27 2011	(r33305)
@@ -237,9 +237,13 @@ void guiInit(void)
     }
 
     if (gui_save_pos) {
+        if (gui_main_pos_x != -3)
         appMPlayer.main.x = gui_main_pos_x;
+        if (gui_main_pos_y != -3)
         appMPlayer.main.y = gui_main_pos_y;
+        if (gui_sub_pos_x != -3)
         appMPlayer.sub.x  = gui_sub_pos_x;
+        if (gui_sub_pos_y != -3)
         appMPlayer.sub.y  = gui_sub_pos_y;
     }