fix issues with text_scale, text_color, text_align

direct/src/gui/DirectEntry.py

@@ -166,11 +166,30 @@ class DirectEntry(DirectFrame):
     def getBounds(self, state = 0):
         # Compute the width and height for the entry itself, ignoring
         # geometry etc.
-        lineHeight = self.onscreenText.textNode.getLineHeight()
+        tn = self.onscreenText.textNode
+        mat = tn.getTransform()
+        align = tn.getAlign()
+        lineHeight = tn.getLineHeight()
         numLines = self['numLines']
         width = self['width']
-        self.ll.set(0.0, 0.0, -0.3 * lineHeight - (lineHeight * (numLines - 1)))
-        self.ur.set(width, 0.0, lineHeight * 1.3)
+
+        if align == TextNode.ALeft:
+            left = 0.0
+            right = width
+        elif align == TextNode.ACenter:
+            left = -width / 2.0
+            right = width / 2.0
+        elif align == TextNode.ARight:
+            left = -width
+            right = 0.0
+
+        bottom = -0.3 * lineHeight - (lineHeight * (numLines - 1))
+        top = lineHeight
+        
+        self.ll.set(left, 0.0, bottom)
+        self.ur.set(right, 0.0, top)
+        self.ll = mat.xformPoint(self.ll)
+        self.ur = mat.xformPoint(self.ur)
 
         # Scale bounds to give a pad around graphics.  We also want to
         # scale around the border width.

panda/src/pgui/pgEntry.I

@@ -205,7 +205,7 @@ get_cursor_def() {
 INLINE void PGEntry:: 
 clear_cursor_def() {
   _cursor_def.remove_node();
-  _cursor_def = _text_render_root.attach_new_node("cursor");
+  _cursor_def = _cursor_scale.attach_new_node("cursor");
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -435,6 +435,7 @@ set_wtext(const wstring &wtext) {
   _text_geom_stale = true;
   _cursor_stale = true;
   _blink_start = ClockObject::get_global_clock()->get_frame_time();
+  set_cursor_position(_wtext.size());
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/pgui/pgEntry.cxx

@@ -57,7 +57,8 @@ PGEntry(const string &name) :
   _blink_rate = 1.0f;
 
   _text_render_root = NodePath("text_root");
-  _cursor_def = _text_render_root.attach_new_node("cursor");
+  _cursor_scale = _text_render_root.attach_new_node("cursor_scale");
+  _cursor_def = _cursor_def.attach_new_node("cursor");
   _cursor_visible = true;
 
   // These strings are used to specify the TextProperties to apply to
@@ -580,7 +581,7 @@ setup(float width, int num_lines) {
   LineSegs ls;
   ls.set_color(0.0f, 0.0f, 0.0f, 1.0f);
   ls.move_to(0.0f, 0.0f, -0.15f * line_height);
-  ls.draw_to(0.0f, 0.0f, 0.85f * line_height);
+  ls.draw_to(0.0f, 0.0f, 0.70f * line_height);
   get_cursor_def().attach_new_node(ls.create());
   
   /*
@@ -761,6 +762,10 @@ update_text() {
       // Get the left edge of the text at this line.
       line._left = 0.0f;
       if (_last_text_def->get_align() != TextNode::A_left) {
+        // Temporarily set this line's text in the TextNode, just so
+        // we can measure the left margin.  (If align is A_left, we
+        // know that the left margin is 0.0, so we don't need to do
+        // this.)
         _last_text_def->set_wtext(line._str);
         line._left = _last_text_def->get_left();
       }
@@ -782,6 +787,10 @@ update_text() {
     if (!_current_text.is_empty()) {
       _current_text.remove_node();
     }
+
+    // We need to reset the text, since we might have changed it
+    // temporarily in the above when align is not A_left.
+    _last_text_def->set_wtext(display_wtext);
     _current_text = 
       _text_render_root.attach_new_node(_last_text_def->generate());
     _text_geom_stale = false;
@@ -798,6 +807,8 @@ void PGEntry::
 update_cursor() {
   TextNode *node = get_text_def(get_state());
   nassertv(node != (TextNode *)NULL);
+  _cursor_scale.set_mat(node->get_transform());
+  _cursor_scale.set_color(node->get_text_color());
 
   if (_cursor_stale || node != _last_text_def) {
     update_text();
@@ -853,9 +864,9 @@ void PGEntry::
 show_hide_cursor(bool visible) {
   if (visible != _cursor_visible) {
     if (visible) {
-      _cursor_def.show();
+      _cursor_scale.show();
     } else {
-      _cursor_def.hide();
+      _cursor_scale.hide();
     }
     _cursor_visible = visible;
   }

panda/src/pgui/pgEntry.h

@@ -176,6 +176,7 @@ private:
   // This is the node that represents the cursor geometry.  It is also
   // attached to the above node, and is transformed around and/or
   // hidden according to the cursor's position and blink state.
+  NodePath _cursor_scale;
   NodePath _cursor_def;
 
   double _blink_start;