[Themes] Set navigationbar layout margin and spacing from style sheet.

bin/themes/chrome/main.css

@@ -56,6 +56,12 @@
 }
 
 /*NavigationBar*/
+#navigationbar
+{
+    qproperty-layoutMargin: 3;
+    qproperty-layoutSpacing: 3;
+}
+
 #navigationbar QSplitter::handle
 {
     background-color:transparent;

bin/themes/default/main.css

@@ -54,6 +54,12 @@
 }
 
 /*NavigationBar*/
+#navigationbar
+{
+    qproperty-layoutMargin: 2;
+    qproperty-layoutSpacing: 3;
+}
+
 #navigationbar QSplitter::handle
 {
     background-color:transparent;

bin/themes/mac/main.css

@@ -50,6 +50,12 @@
 }
 
 /*NavigationBar*/
+#navigationbar
+{
+    qproperty-layoutMargin: 4;
+    qproperty-layoutSpacing: 3;
+}
+
 #navigationbar QSplitter::handle
 {
     height: 8px;

bin/themes/windows/main.css

@@ -56,6 +56,12 @@
 }
 
 /*NavigationBar*/
+#navigationbar
+{
+    qproperty-layoutMargin: 3;
+    qproperty-layoutSpacing: 3;
+}
+
 #navigationbar QSplitter::handle
 {
     background-color:transparent;

src/lib/navigation/navigationbar.cpp

@@ -74,9 +74,6 @@ NavigationBar::NavigationBar(QupZilla* mainClass)
 {
     setObjectName("navigationbar");
     m_layout = new QHBoxLayout(this);
-    m_layout->setMargin(3);
-    m_layout->setSpacing(3);
-
     m_layout->setMargin(style()->pixelMetric(QStyle::PM_ToolBarItemMargin, 0, this));
     m_layout->setSpacing(style()->pixelMetric(QStyle::PM_ToolBarItemSpacing, 0, this));
     setLayout(m_layout);
@@ -218,6 +215,26 @@ void NavigationBar::setSuperMenuVisible(bool visible)
     m_supMenu->setVisible(visible);
 }
 
+int NavigationBar::layoutMargin() const
+{
+    return m_layout->margin();
+}
+
+void NavigationBar::setLayoutMargin(int margin)
+{
+    m_layout->setMargin(margin);
+}
+
+int NavigationBar::layoutSpacing() const
+{
+    return m_layout->spacing();
+}
+
+void NavigationBar::setLayoutSpacing(int spacing)
+{
+    m_layout->setSpacing(spacing);
+}
+
 void NavigationBar::aboutToShowHistoryBackMenu()
 {
     if (!m_menuBack || !p_QupZilla->weView()) {

src/lib/navigation/navigationbar.h

@@ -38,6 +38,9 @@ class QT_QUPZILLA_EXPORT NavigationBar : public QWidget
 public:
     explicit NavigationBar(QupZilla* mainClass);
 
+    Q_PROPERTY(int layoutMargin READ layoutMargin WRITE setLayoutMargin)
+    Q_PROPERTY(int layoutSpacing READ layoutSpacing WRITE setLayoutSpacing)
+
     void setSplitterSizes(int locationBar, int websearchBar);
 
     void showReloadButton();
@@ -54,6 +57,12 @@ public:
 
     void setSuperMenuVisible(bool visible);
 
+    int layoutMargin() const;
+    void setLayoutMargin(int margin);
+
+    int layoutSpacing() const;
+    void setLayoutSpacing(int spacing);
+
 signals:
 
 public slots:

src/lib/tools/clickablelabel.cpp

@@ -18,7 +18,6 @@
 #include "clickablelabel.h"
 
 #include <QMouseEvent>
-#include <QIcon>
 
 ClickableLabel::ClickableLabel(QWidget* parent)
     : QLabel(parent)
@@ -35,6 +34,11 @@ void ClickableLabel::setThemeIcon(const QString &name)
     }
 }
 
+QIcon ClickableLabel::fallbackIcon() const
+{
+    return pixmap() ? QIcon(*pixmap()) : QIcon();
+}
+
 void ClickableLabel::setFallbackIcon(const QIcon &image)
 {
     if (!pixmap() || pixmap()->isNull()) {

src/lib/tools/clickablelabel.h

@@ -19,6 +19,7 @@
 #define CLICKABLELABEL_H
 
 #include <QLabel>
+#include <QIcon>
 
 #include "qz_namespace.h"
 
@@ -31,7 +32,7 @@ class QT_QUPZILLA_EXPORT ClickableLabel : public QLabel
     Q_PROPERTY(int fixedwidth READ width WRITE setFixedWidth)
     Q_PROPERTY(int fixedheight READ height WRITE setFixedHeight)
     Q_PROPERTY(QString themeIcon READ themeIcon WRITE setThemeIcon)
-    Q_PROPERTY(QIcon fallbackIcon WRITE setFallbackIcon)
+    Q_PROPERTY(QIcon fallbackIcon READ fallbackIcon WRITE setFallbackIcon)
 
 public:
     explicit ClickableLabel(QWidget* parent = 0);
@@ -39,6 +40,7 @@ public:
     QString themeIcon() const;
     void setThemeIcon(const QString &name);
 
+    QIcon fallbackIcon() const;
     void setFallbackIcon(const QIcon &image);
 
 signals: