Changeset 11030

Timestamp:

01/29/10 15:55:52 (3 years ago)

Author:

robert

Message:

From Trajce Nikolov, bug fixes

Files:

• OpenSceneGraph/trunk/src/osgWidget/Input.cpp (modified) (9 diffs)

OpenSceneGraph/trunk/src/osgWidget/Input.cpp

@@ -141 +141 @@
         for (unsigned int i=0; i<glyphs.size(); ++i)
         {
+            static osgText::Font::Glyph* previous_g = 0;
+
             osgText::Font::Glyph* g = glyphs.at(i);
             if (g->getGlyphCode()==key)
@@ -155 +157 @@
                     _offsets[idx] += g->getHorizontalAdvance();
                 ++idx;
+
+                if (previous_g)
+                {
+                    {
+                        point_type& ref = _offsets[idx];
+                        ref += previous_g->getHorizontalAdvance();
+                    }
+                    {
+                        point_type& ref = _widths[idx];
+                        ref += previous_g->getHorizontalAdvance();
+                    }
+                }
+                previous_g = g;
 
                 glyphs.erase(glyphs.begin()+i);
@@ -233 +248 @@
    if (_selectionMax-_selectionMin>0)
    {
-       unsigned int size = 0;
-       
-       for (unsigned int i=_selectionMin; i<_selectionMax; ++i)
-       {
-           size += _widths[i];
-       }
-       point_type xoffset = _selectionMin > 0 ? _offsets[_selectionMin - 1] : 0.0f;
-
-       _selection->setSize(size, getHeight());
-       _selection->setOrigin(getX() + xoffset, getY());
+       point_type xstart = _selectionMin > 0 ? _offsets[_selectionMin - 1] : 0.0f;
+       point_type xend = (_selectionMax > 0 ? _offsets[_selectionMax - 1] : 0.0f) + _widths[_selectionMax];
+
+       _selection->setSize(xend-xstart, getHeight());
+       _selection->setOrigin(getX() + xstart, getY());
        _selection->setZ(_calculateZ(LAYER_MIDDLE-2));
    }
@@ -260 +270 @@
     x = _mouseClickX;
 
-    unsigned int size = 0;
-    for ( unsigned int i=0; i< _widths.size(); ++i )
-    {
-        if (x > size && x < size+_widths.at(i))
-        {
-            _selectionEndIndex = _index = i;
+    for ( unsigned int i=0; i< _offsets.size()-1; ++i )
+    {
+        point_type offset1 = i > 0 ? _offsets.at(i-1) : 0;
+        point_type offset2 = _offsets.at(i);
+        if (x >= offset1 && x <= offset2)
+        {
+            _selectionEndIndex = _index = i; 
             positioned();
             break;
         }
-        size += _widths.at(i);
-    }
+    }
+
     return false;
 }
 
-bool Input::mousePush (double x, double y, const WindowManager*)
+bool Input::mousePush (double x, double y, const WindowManager* wm)
 {
     double offset = getOrigin().x();
     Window* window = getParent();
-    while (window) { offset += window->getOrigin().x(); window = window->getParent(); }
+    if (window) 
+    { 
+        offset += window->getOrigin().x(); 
+    }
 
     x -= offset;
     _mouseClickX = x;
-    
-    unsigned int size = 0;
-    for ( unsigned int i=0; i< _widths.size(); ++i )
-    {
-        if (x > size && x < size+_widths.at(i))
-        {
-            _selectionStartIndex = _selectionEndIndex = _index = i;
+
+    for ( unsigned int i=0; i< _offsets.size()-1; ++i )
+    {
+        point_type offset1 = i > 0 ? _offsets.at(i-1) : 0;
+        point_type offset2 = i == 0 ? _offsets.at(1) : _offsets.at(i);
+        if (x >= offset1 && x <= offset2)
+        {
+            _selectionStartIndex = _selectionEndIndex = _index = i; 
             positioned();
             break;
         }
-        size += _widths.at(i);
     }
     return false;
@@ -402 +416 @@
                 for (unsigned int i=0; i < s.size()-_selectionMin; ++i)
                 {
-                    s[_selectionMin+i] = deleteToIdx+i < s.size() ? s[deleteToIdx+i] : ' ';
+                    s[_selectionMin+i] = deleteToIdx+i+1 < s.size() ? s[deleteToIdx+i+1] : ' ';
                 }
 
@@ -462 +476 @@
                 for (unsigned int i=0; i < s.size()-_selectionMin; ++i)
                 {
-                    s[_selectionMin+i] = deleteToIdx+i < s.size() ? s[deleteToIdx+i] : ' ';
+                    s[_selectionMin+i] = deleteToIdx+i+1 < s.size() ? s[deleteToIdx+i+1] : ' ';
                 }
 
@@ -550 +564 @@
             {
                 std::string data;
-                for (unsigned int i=_selectionMin; i<_selectionMax; ++i)
+                for (unsigned int i=_selectionMin; i<=_selectionMax; ++i)
                 {
                     data.push_back(s[i]);
@@ -580 +594 @@
                 for (unsigned int i=0; i < s.size()-_selectionMin; ++i)
                 {
-                    s[_selectionMin+i] = deleteToIdx+i < s.size() ? s[deleteToIdx+i] : ' ';
+                    s[_selectionMin+i] = deleteToIdx+i+1 < s.size() ? s[deleteToIdx+i+1] : ' ';
                 }
 
@@ -629 +643 @@
 unsigned int Input::calculateBestYOffset(const std::string& s)
 {
+    if (!_text->getFont()) return 0;
+
    const osgText::FontResolution fr(static_cast<unsigned int>(_text->getCharacterHeight()),
                                     static_cast<unsigned int>(_text->getCharacterHeight()));