[Supertuxkart-commit] SF.net SVN: supertuxkart:[5906] main/trunk/src/guiengine

[<au...@us...>]

Revision: 5906
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=5906&view=rev
Author:   auria
Date:     2010-09-06 17:50:29 +0000 (Mon, 06 Sep 2010)

Log Message:
-----------
tweak text bubble widget so that the text cannot go too close to the right edge of the widget

Modified Paths:
--------------
    main/trunk/src/guiengine/skin.cpp
    main/trunk/src/guiengine/widgets/bubble_widget.cpp
    main/trunk/src/guiengine/widgets/bubble_widget.hpp

Modified: main/trunk/src/guiengine/skin.cpp
===================================================================
--- main/trunk/src/guiengine/skin.cpp	2010-09-06 17:41:05 UTC (rev 5905)
+++ main/trunk/src/guiengine/skin.cpp	2010-09-06 17:50:29 UTC (rev 5906)
@@ -1639,7 +1639,7 @@
 
         // minor adjustments...
         rect2.UpperLeftCorner.X -= 7;
-        //rect2.LowerRightCorner.X -= 15;
+        rect2.LowerRightCorner.X += BUBBLE_MARGIN_ON_RIGHT;
 
         if (bubble->isFocusedForPlayer(PLAYER_ID_GAME_MASTER))
             drawBoxFromStretchableTexture(widget, rect2, SkinConfig::m_render_params["textbubble::focused"]);

Modified: main/trunk/src/guiengine/widgets/bubble_widget.cpp
===================================================================
--- main/trunk/src/guiengine/widgets/bubble_widget.cpp	2010-09-06 17:41:05 UTC (rev 5905)
+++ main/trunk/src/guiengine/widgets/bubble_widget.cpp	2010-09-06 17:50:29 UTC (rev 5906)
@@ -34,7 +34,7 @@
 
 void BubbleWidget::add()
 {
-    m_shrinked_size = rect<s32>(m_x, m_y, m_x + m_w, m_y + m_h);
+    m_shrinked_size = rect<s32>(m_x, m_y, m_x + m_w - BUBBLE_MARGIN_ON_RIGHT, m_y + m_h);
     stringw message = getText();
         
     EGUI_ALIGNMENT align = EGUIA_UPPERLEFT;

Modified: main/trunk/src/guiengine/widgets/bubble_widget.hpp
===================================================================
--- main/trunk/src/guiengine/widgets/bubble_widget.hpp	2010-09-06 17:41:05 UTC (rev 5905)
+++ main/trunk/src/guiengine/widgets/bubble_widget.hpp	2010-09-06 17:50:29 UTC (rev 5906)
@@ -23,6 +23,7 @@
 
 namespace GUIEngine
 {
+    const int BUBBLE_MARGIN_ON_RIGHT = 15;
     
     class BubbleWidget : public Widget
     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.