[Pingus-CVS] rev 2305 - trunk/src/editor

[Ingo Ruhnke]

Author: grumbel
Date: 2004-05-06 19:59:10 +0200 (Thu, 06 May 2004)
New Revision: 2305

Modified:
   trunk/src/editor/editor.cxx
   trunk/src/editor/editor_event.cxx
   trunk/src/editor/panel.cxx
Log:
- fixed input handling a bit

Modified: trunk/src/editor/editor.cxx
===================================================================
--- trunk/src/editor/editor.cxx 2004-05-06 17:30:17 UTC (rev 2304)
+++ trunk/src/editor/editor.cxx 2004-05-06 17:59:10 UTC (rev 2305)
@@ -195,13 +195,11 @@
 
   gui->show ();
 
-  if (get_gui_manager()->get_focus () == get_gui_manager ())
+  if (get_gui_manager()->has_mouse_over())
     CL_Display::draw_rect(CL_Rect(25, 0, CL_Display::get_width (), 
CL_Display::get_height ()),
                           CL_Color(255, 255, 255));
-
 }
 
-
 void
 Editor::scroll ()
 {
@@ -444,7 +442,7 @@
 void
 Editor::move_objects()
 {
-  if (get_gui_manager()->get_focus () == get_gui_manager ())
+  if (get_gui_manager()->has_mouse_over())
     {
       // FIXME: this is really a dirty dirty hack
       // FIXME: To fix this the whole editor should be build up out of 
CL_Components

Modified: trunk/src/editor/editor_event.cxx
===================================================================
--- trunk/src/editor/editor_event.cxx   2004-05-06 17:30:17 UTC (rev 2304)
+++ trunk/src/editor/editor_event.cxx   2004-05-06 17:59:10 UTC (rev 2305)
@@ -842,7 +842,7 @@
   return
     is_enabled
     &&
-    (editor->get_gui_manager ()->get_focus () == editor->get_gui_manager ());
+    (editor->get_gui_manager ()->has_mouse_over());
 }
 
 } // namespace EditorNS

Modified: trunk/src/editor/panel.cxx
===================================================================
--- trunk/src/editor/panel.cxx  2004-05-06 17:30:17 UTC (rev 2304)
+++ trunk/src/editor/panel.cxx  2004-05-06 17:59:10 UTC (rev 2305)
@@ -61,6 +61,7 @@
        {
          button.draw(0, y);
        }
+
       if (mouse_over_time == 0)
        mouse_over_time = CL_System::get_time ();
 
@@ -101,7 +102,7 @@
   int y = 0;
 
   CL_Display::fill_rect(CL_Rect(0, 0, 25, CL_Display::get_height()),
-                        CL_Color(190, 190, 190, 1));
+                        CL_Color(190, 190, 190, 255));
 
   logo.draw(0, CL_Display::get_height() - logo.get_height());