code formatted

8 years ago · f701864a69
parent 170a2eec15
commit f701864a69
10 changed files with 66 additions and 56 deletions
--- a/app/iconitem.h
+++ b/app/iconitem.h
@ -141,8 +141,7 @@ private:
    
    bool m_textureChanged;
    bool m_sizeChanged;
-    
-    
 };
+
 }
 #endif // ICONITEM_H
--- a/app/visibilitymanager.cpp
+++ b/app/visibilitymanager.cpp
@ -271,13 +271,25 @@ bool VisibilityManagerPrivate::event(QEvent *ev)
        containsMouse = true;
        emit q->containsMouseChanged();
        
+        <<< <<< < HEAD
        raiseDock(true);
+        == == == =
+
+            if (mode == Dock::AutoHide)
+                raiseDock(true);
+
+        >>> >>> > code formatted
    } else if (ev->type() == QEvent::Leave && containsMouse) {
        containsMouse = false;
        emit q->containsMouseChanged();

        if (mode == Dock::AutoHide)
            raiseDock(false);
+            
+        <<< <<< <HEAD
+        == == == =
+
+            >>>>>>> code formatted
    } else if (ev->type() == QEvent::Show) {
        wm->setDockDefaultFlags();
    }
@ -350,4 +362,3 @@ void VisibilityManager::updateDockGeometry(const QRect &geometry)
 //! END: VisibilityManager implementation
 }

-