Changeset 1614:350c1d8bb7cc in lemon-0.x

Timestamp:

08/07/05 16:17:11 (19 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2121

Message:

Alpar had the key, focus can be set in the window class. But it is not enough, the focused widget has to be activated, as well! Was a hard task to find out... By the way, two compilation warnings are removed.

Location:

gui

Files:

• graph_displayer_canvas-edge.cc (modified) (1 diff)
• graph_displayer_canvas-event.cc (modified) (1 diff)
• graph_displayer_canvas-node.cc (modified) (1 diff)
• graph_displayer_canvas.cc (modified) (2 diffs)
• graph_displayer_canvas.h (modified) (2 diffs)
• main_win.cc (modified) (1 diff)

gui/graph_displayer_canvas-edge.cc

@@ -26 +26 @@
       for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i)
         {
-          double v=abs((*actual_map)[i]);
+          double v=fabs((*actual_map)[i]);
           int w;
           if(min==max)

gui/graph_displayer_canvas-event.cc

@@ -623 +623 @@
                         canvasentrywidget->property_width().set_value(edgetextmap[active_edge]->property_text_width().get_value()*4);
                         canvasentrywidget->property_height().set_value(edgetextmap[active_edge]->property_text_height().get_value()*1.5);
+
+                        //setting the focus to newly created widget
+                        parentwin->set_focus(entrywidget);
+                        parentwin->activate_focus();
                       }
                   }

gui/graph_displayer_canvas-node.cc

@@ -25 +25 @@
       for (NodeIt i(mapstorage.graph); i!=INVALID; ++i)
         {
-          double v=abs((*actual_map)[i]);
+          double v=fabs((*actual_map)[i]);
           int w;
           if(min==max)

gui/graph_displayer_canvas.cc

@@ -3 +3 @@
 #include <math.h>
 
-GraphDisplayerCanvas::GraphDisplayerCanvas(MapStorage & ms, MapWin & mw) :
+GraphDisplayerCanvas::GraphDisplayerCanvas(MapStorage & ms, MapWin & mw, Gtk::Window * mainwin) :
   nodesmap(ms.graph), edgesmap(ms.graph), edgetextmap(ms.graph),
   nodetextmap(ms.graph), displayed_graph(*(root()), 0, 0),
@@ -9 +9 @@
   target_item(NULL), nodemap_to_edit(""), edgemap_to_edit(""), mapwin(mw)
 {
+  parentwin=mainwin;
+
   //base event handler is move tool
   actual_handler=signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::moveEventHandler), false);

gui/graph_displayer_canvas.h

@@ -19 +19 @@
 
 public:
-  GraphDisplayerCanvas(MapStorage &, MapWin &);
+  GraphDisplayerCanvas(MapStorage &, MapWin &, Gtk::Window *);
   virtual ~GraphDisplayerCanvas();
 
@@ -178 +178 @@
   MapWin & mapwin;
 
+  ///We need to store the parent window to be able to set the focus on a given widget
+  ///We will use this variable to activate the set focus on entry widget in the case of editing map values.
+  Gtk::Window * parentwin;
+
 };
 

gui/main_win.cc

@@ -3 +3 @@
 MainWin::MainWin(const std::string& title) :
   mapwin("Map Setup", mapstorage, gd_canvas),
-  newmapwin("Creating new map", gd_canvas), gd_canvas(mapstorage, mapwin)
-{
-
+  newmapwin("Creating new map", gd_canvas), gd_canvas(mapstorage, mapwin, (Gtk::Window *)this)
+{
   set_title (title);
   set_default_size(WIN_WIDTH,WIN_HEIGHT);