[Uml-devel] branches/KDE/3.5/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 608561 by okellogg:

Apply DrawNoteOnTop.diff by Achim Spangler at
http://www.geeksoc.org/~jr/umbrello/uml-devel/9863.html
Achim, your continual bugfixes earn you an honor seat in the AUTHORS file :)


 M  +1 -1      AUTHORS  
 M  +3 -1      umbrello/notewidget.cpp  
 M  +1 -1      umbrello/umlwidget.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/AUTHORS #608560:608561
@@ -11,4 +11,4 @@
 * Brian Thomas (advanced code generators, associations, various)
 * Oliver Kellogg (many areas)
 * Daniel Calviño Sánchez (refactoring, UI behavior)
-
+* Achim Spangler (countless bugfixes)
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/notewidget.cpp #608560:608561
@@ -34,6 +34,7 @@
         : UMLWidget(view, id, new NoteWidgetController(this)) {
     init();
     setSize(100,80);
+    setZ( 20 ); //make sure always on top.
 #ifdef NOTEWIDGET_EMBED_EDITOR
     // NB: This code is currently deactivated because
     // Zoom does not yet work with the embedded text editor.
@@ -235,7 +236,7 @@
         } else {
             // all chars of text have been handled already ->
             // perform this last run to spool current content of "word"
-            c = returnChar; 
+            c = returnChar;
         }
         if (c == returnChar || c.isSpace()) {
             // new word delimiter found -> its time to decide on word wrap
@@ -302,6 +303,7 @@
 bool NoteWidget::loadFromXMI( QDomElement & qElement ) {
     if( !UMLWidget::loadFromXMI( qElement ) )
         return false;
+    setZ( 20 ); //make sure always on top.
     setDoc( qElement.attribute("text", "") );
     QString diagramlink = qElement.attribute("diagramlink", "");
     if (!diagramlink.isEmpty())
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlwidget.cpp #608560:608561
@@ -704,7 +704,7 @@
             << bkgnd->getZ() + 1 << ", SelectState: " << _select << endl;
         setZ( bkgnd->getZ() + 1 );
     } else {
-        setZ( 0 );
+        setZ( m_origZ );
     }
 
     update();