glom r2028 - trunk/glom/utility_widgets/canvas

[murrayc svn gnome org]

Author: murrayc
Date: Wed Mar 25 22:46:56 2009
New Revision: 2028
URL: http://svn.gnome.org/viewvc/glom?rev=2028&view=rev

Log:
2009-03-25  Murray Cumming  <murrayc murrayc com>

* glom/utility_widgets/canvas/canvas_line_movable.cc: get_xy(), 
set_xy(), get_width_height(), set_width_height():
* glom/utility_widgets/canvas/canvas_text_movable.cc
get_width_height, set_width_height(): Use the new properties instead 
of our custom implementations.


Modified:
   trunk/glom/utility_widgets/canvas/canvas_text_movable.cc
   trunk/glom/utility_widgets/canvas/canvas_text_movable.h

Modified: trunk/glom/utility_widgets/canvas/canvas_text_movable.cc
==============================================================================
--- trunk/glom/utility_widgets/canvas/canvas_text_movable.cc	(original)
+++ trunk/glom/utility_widgets/canvas/canvas_text_movable.cc	Wed Mar 25 22:46:56 2009
@@ -29,8 +29,7 @@
 
 CanvasTextMovable::CanvasTextMovable(const Glib::ustring& text, double x, double y, double width, Gtk::AnchorType anchor)
 : Goocanvas::Text(text, x, y, width, anchor), 
-  m_snap_corner(CORNER_TOP_LEFT), //arbitrary default.
-  m_fake_height(0)
+  m_snap_corner(CORNER_TOP_LEFT) //arbitrary default.
 {
   init();
 }

Modified: trunk/glom/utility_widgets/canvas/canvas_text_movable.h
==============================================================================
--- trunk/glom/utility_widgets/canvas/canvas_text_movable.h	(original)
+++ trunk/glom/utility_widgets/canvas/canvas_text_movable.h	Wed Mar 25 22:46:56 2009
@@ -79,10 +79,6 @@
   //What corner is considered when snapping to a grid while moving:
   Corners m_snap_corner;
 
-  //Goocanvas does not yet allow us to truncate vertically, and a greater-than-necessary height would have no meaning,
-  //but we need to store a height just so that get==set.
-  double m_fake_height; 
-
   //We rememeber this so we can reconstruct the pango markup when the text size changes:
   Glib::ustring m_text;
   Glib::ustring m_font;