Minor cleanup of icon positions.

McFarJ · Jul 26, 2017 · cb09863 · cb09863
1 parent 56ab14d
commit cb09863
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 14 deletions.
diff --git a/gui/browserWidgets/tagviewer.cpp b/gui/browserWidgets/tagviewer.cpp
@@ -77,7 +77,7 @@ void TagViewer::showEvent(QShowEvent* event) {
 void TagViewer::resize() {
     QFontMetrics fm(font());
     int width = fm.width(text());
-    int height = fm.height();
+    int height = fm.descent();
 
 //    setMaximumWidth(width+sz.width()+2+clearButton->minimumWidth());
 //    setMinimumWidth(width+sz.width()+2+clearButton->minimumWidth());
@@ -88,7 +88,7 @@ void TagViewer::resize() {
 
     int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
     clearButton->move(rect().left() + width + frameWidth,
-                      (rect().bottom()- height - 5 )/2);
+                      (rect().top()- height)/2);
 }
 
 

diff --git a/gui/favoritesview.cpp b/gui/favoritesview.cpp
@@ -100,6 +100,8 @@ FavoritesView::FavoritesView(QWidget *parent) :
     connect(deleteShortcut, SIGNAL(activated()), this, SLOT(deleteRequested()));
 
     root->setExpanded(true);
+    this->setProperty("animated", false);
+
     resetSize();
 }
 
@@ -323,10 +325,12 @@ void FavoritesView::drawBranches(QPainter *painter, const QRect &rect, const QMo
     painter->save();
     if (isExpanded(index)) {
         int offset = rect.width()-expandedImage->width()-1;
-        painter->drawImage(offset, rect.y()+(expandedImage->height()/4),*expandedImage);
+        int voffset = (rect.height() - expandedImage->height()) / 2;
+        painter->drawImage(offset, rect.y()+voffset,*expandedImage);
     } else {
         int offset = rect.width()-collapsedImage->width()-1;
-        painter->drawImage(offset, rect.y()+(collapsedImage->height()/4),*collapsedImage);
+        int voffset = (rect.height() - collapsedImage->height()) / 2;
+        painter->drawImage(offset, rect.y()+voffset,*collapsedImage);
     }
     painter->restore();
     return;

diff --git a/gui/nattributetree.cpp b/gui/nattributetree.cpp
@@ -373,6 +373,9 @@ NAttributeTree::NAttributeTree(QWidget *parent) :
     this->setFrameShape(QFrame::NoFrame);
     expandedImage = new QImage(":expandedIcon");
     collapsedImage = new QImage(":collapsedIcon");
+
+    this->setProperty("animated", false);
+
 }
 
 NAttributeTree::~NAttributeTree() {
@@ -552,10 +555,12 @@ void NAttributeTree::drawBranches(QPainter *painter, const QRect &rect, const QM
     painter->save();
     if (isExpanded(index)) {
         int offset = rect.width()-expandedImage->width()-1;
-        painter->drawImage(offset, rect.y()+(expandedImage->height()/4),*expandedImage);
+        int voffset = (rect.height() - expandedImage->height()) / 2;
+        painter->drawImage(offset, rect.y()+voffset,*expandedImage);
     } else {
         int offset = rect.width()-collapsedImage->width()-1;
-        painter->drawImage(offset, rect.y()+(collapsedImage->height()/4),*collapsedImage);
+        int voffset = (rect.height() - collapsedImage->height()) / 2;
+        painter->drawImage(offset, rect.y()+voffset,*collapsedImage);
     }
     painter->restore();
     return;

diff --git a/gui/nnotebookview.cpp b/gui/nnotebookview.cpp
@@ -155,6 +155,8 @@ NNotebookView::NNotebookView(QWidget *parent) :
 
     expandedImage = new QImage(":expandedIcon");
     collapsedImage = new QImage(":collapsedIcon");
+
+    this->setProperty("animated", false);
 }
 
 
@@ -1039,15 +1041,15 @@ void NNotebookView::drawBranches(QPainter *painter, const QRect &rect, const QMo
     if (!index.child(0,0).isValid())
         return;
 
-    QLOG_DEBUG() << expandedImage->size();
-
     painter->save();
     if (isExpanded(index)) {
         int offset = rect.width()-expandedImage->width()-1;
-        painter->drawImage(offset, rect.y()+(expandedImage->height()/4),*expandedImage);
+        int voffset = (rect.height() - expandedImage->height()) / 2;
+        painter->drawImage(offset, rect.y()+voffset,*expandedImage);
     } else {
         int offset = rect.width()-collapsedImage->width()-1;
-        painter->drawImage(offset, rect.y()+(collapsedImage->height()/4),*collapsedImage);
+        int voffset = (rect.height() - collapsedImage->height()) / 2;
+        painter->drawImage(offset, rect.y()+voffset,*collapsedImage);
     }
     painter->restore();
     return;

diff --git a/gui/nsearchview.cpp b/gui/nsearchview.cpp
@@ -106,6 +106,7 @@ NSearchView::NSearchView(QWidget *parent) :
     expandedImage = new QImage(":expandedIcon");
     collapsedImage = new QImage(":collapsedIcon");
 
+    this->setProperty("animated", false);
 }
 
 
@@ -494,10 +495,12 @@ void NSearchView::drawBranches(QPainter *painter, const QRect &rect, const QMode
     painter->save();
     if (isExpanded(index)) {
         int offset = rect.width()-expandedImage->width()-1;
-        painter->drawImage(offset, rect.y()+(expandedImage->height()/4),*expandedImage);
+        int voffset = (rect.height() - expandedImage->height()) / 2;
+        painter->drawImage(offset, rect.y()+voffset,*expandedImage);
     } else {
         int offset = rect.width()-collapsedImage->width()-1;
-        painter->drawImage(offset, rect.y()+(collapsedImage->height()/4),*collapsedImage);
+        int voffset = (rect.height() - collapsedImage->height()) / 2;
+        painter->drawImage(offset, rect.y()+voffset,*collapsedImage);
     }
     painter->restore();
     return;

diff --git a/gui/ntagview.cpp b/gui/ntagview.cpp
@@ -131,6 +131,8 @@ NTagView::NTagView(QWidget *parent) :
     this->setFrameShape(QFrame::NoFrame);
     expandedImage = new QImage(":expandedIcon");
     collapsedImage = new QImage(":collapsedIcon");
+
+    this->setProperty("animated", false);
 }
 
 
@@ -933,10 +935,12 @@ void NTagView::drawBranches(QPainter *painter, const QRect &rect, const QModelIn
     painter->save();
     if (isExpanded(index)) {
         int offset = rect.width()-expandedImage->width()-1;
-        painter->drawImage(offset, rect.y()+(expandedImage->height()/4),*expandedImage);
+        int voffset = (rect.height() - expandedImage->height()) / 2;
+        painter->drawImage(offset, rect.y()+voffset,*expandedImage);
     } else {
         int offset = rect.width()-collapsedImage->width()-1;
-        painter->drawImage(offset, rect.y()+(collapsedImage->height()/4),*collapsedImage);
+        int voffset = (rect.height() - collapsedImage->height()) / 2;
+        painter->drawImage(offset, rect.y()+voffset,*collapsedImage);
     }
     painter->restore();
     return;