[Mp-plugins-svn] SF.net SVN: mp-plugins:[2069] trunk/plugins/WorldMap

[<lk...@us...>]

Revision: 2069
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2069&view=rev
Author:   lkuech
Date:     2008-08-22 12:29:28 +0000 (Fri, 22 Aug 2008)

Log Message:
-----------
WorldMap: Some more small adaption concerning the VirtualKeyboard

Modified Paths:
--------------
    trunk/plugins/WorldMap/NewVirtualKeyboard.cs
    trunk/plugins/WorldMap/WorldmapSearch.cs

Modified: trunk/plugins/WorldMap/NewVirtualKeyboard.cs
===================================================================
--- trunk/plugins/WorldMap/NewVirtualKeyboard.cs	2008-08-22 12:08:23 UTC (rev 2068)
+++ trunk/plugins/WorldMap/NewVirtualKeyboard.cs	2008-08-22 12:29:28 UTC (rev 2069)
@@ -378,6 +378,7 @@
     };
     #endregion
 
+
     class Key
     {
       public Xkey xKey;       // virtual key code
@@ -569,12 +570,10 @@
 
       _searchKind = (int)SearchKinds.SEARCH_CONTAINS; // default search Contains
 
-      Location = new MediaPortal.Drawing.Point(64, 208);
-
       int y = 411;
       int x = 40;
 
-      //GUIGraphicsContext.ScalePosToScreenResolution(ref x, ref y);
+      GUIGraphicsContext.ScalePosToScreenResolution(ref x, ref y);
       BUTTON_Y_POS = x;      // button text line
       BUTTON_X_OFFSET = y;      // space between button and text
 
@@ -636,7 +635,7 @@
       int x1 = (int)Location.X;
       int y1 = (int)Location.Y + 42;
       //int y1 = 250, x1 = 64;
-      //GUIGraphicsContext.ScalePosToScreenResolution(ref x1, ref y1);
+      GUIGraphicsContext.ScalePosToScreenResolution(ref x1, ref y1);
       float fY = y1;
       ArrayList keyBoard = (ArrayList)_keyboardList[(int)_currentKeyboard];
       for (int row = 0; row < _maxRows; ++row, fY += _keyHeight)
@@ -1726,7 +1725,7 @@
 
     void DrawText(int x, int y)
     {
-      //GUIGraphicsContext.ScalePosToScreenResolution(ref x, ref y);
+      GUIGraphicsContext.ScalePosToScreenResolution(ref x, ref y);
       x += GUIGraphicsContext.OffsetX;
       y += GUIGraphicsContext.OffsetY;
       string textLine = _textEntered;
@@ -1764,13 +1763,13 @@
       int tmpX = (int)(Location.X);
       int tmpY = (int)Location.Y;
 
-      DrawTextBox(timePassed, (int)(tmpX * SkinRatio), tmpY, (int)((MODEKEY_WIDTH + GAP_WIDTH * 9 + GAP2_WIDTH + KEY_WIDTH * 10 + tmpX) * SkinRatio), tmpY + 40);
+      DrawTextBox(timePassed, (int)(tmpX * SkinRatio), tmpY - 10 , (int)((MODEKEY_WIDTH + GAP_WIDTH * 9 + GAP2_WIDTH + KEY_WIDTH * 10 + tmpX) * SkinRatio), tmpY + 30);
       DrawText((int)(tmpX + 4 * SkinRatio), tmpY);
 
       int x1 = (int)(tmpX*SkinRatio);
       int y1 = tmpY + 42;
 
-      //GUIGraphicsContext.ScalePosToScreenResolution(ref x1, ref y1);
+      GUIGraphicsContext.ScalePosToScreenResolution(ref x1, ref y1);
       x1 += GUIGraphicsContext.OffsetX;
       y1 += GUIGraphicsContext.OffsetY;
       // Draw each row

Modified: trunk/plugins/WorldMap/WorldmapSearch.cs
===================================================================
--- trunk/plugins/WorldMap/WorldmapSearch.cs	2008-08-22 12:08:23 UTC (rev 2068)
+++ trunk/plugins/WorldMap/WorldmapSearch.cs	2008-08-22 12:29:28 UTC (rev 2069)
@@ -199,7 +199,7 @@
       keyboard.Reset();
       keyboard.IsSearchKeyboard = false;
       int x = (int)tmpLabel.Location.X;// +25;
-      int y = (int)tmpLabel.Location.Y - 5;
+      int y = (int)tmpLabel.Location.Y + 5;
       keyboard.Location = new MediaPortal.Drawing.Point(x, y);
       keyboard.Text = tmpLabel.Label;
       keyboard.DoModal(GetID); // show it...


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.