Fixing bug where the sms entry stuff would scroll off screen when it shouldn't

git-svn-id: file:///svnroot/gc-dialer/trunk@600 c39d3808-3fe2-4d86-a59f-b7f623ee9f21

diff --git a/src/dialcentral.glade b/src/dialcentral.glade
index 3819e53..039b19f 100644 (file)
--- a/src/dialcentral.glade
+++ b/src/dialcentral.glade
@@ -1038,14 +1038,14 @@
           <widget class="GtkScrolledWindow" id="smsMessages_scrolledwindow">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">automatic</property>
+            <property name="hscrollbar_policy">never</property>
             <property name="vscrollbar_policy">automatic</property>
             <child>
               <widget class="GtkViewport" id="viewport1">
                 <property name="visible">True</property>
                 <property name="resize_mode">queue</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox1">
+                  <widget class="GtkVBox" id="smsMessagesLayout">
                     <property name="visible">True</property>
                     <property name="orientation">vertical</property>
                     <child>

diff --git a/src/gv_views.py b/src/gv_views.py
index 32888dd..79f2256 100644 (file)
--- a/src/gv_views.py
+++ b/src/gv_views.py
@@ -199,6 +199,8 @@ class SmsEntryDialog(object):
 
                self._phoneButton = self._widgetTree.get_widget("phoneTypeSelection")
                self._smsEntry = self._widgetTree.get_widget("smsEntry")
+               self._smsLayout = self._widgetTree.get_widget("smsMessagesLayout")
+               self._smsLayoutSize = None
 
                self._action = self.ACTION_CANCEL
 
@@ -306,6 +308,10 @@ class SmsEntryDialog(object):
                        self._keyPressEventId = self._dialog.disconnect(keyConnectId)
 
        def _update_letter_count(self, *args):
+               if self._smsLayoutSize is None:
+                       self._smsLayoutSize = self._smsLayout.size_request()
+               else:
+                       self._smsLayout.set_size_request(*self._smsLayoutSize)
                entryLength = self._smsEntry.get_buffer().get_char_count()
 
                charsLeft = self.MAX_CHAR - entryLength