diff --git a/src/resources/icons/close_grey.svg b/src/resources/icons/close_grey.svg new file mode 100644 index 00000000..9f101e1d --- /dev/null +++ b/src/resources/icons/close_grey.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/src/resources/icons/close_red.svg b/src/resources/icons/close_red.svg new file mode 100644 index 00000000..3f300f1c --- /dev/null +++ b/src/resources/icons/close_red.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/src/resources/icons/float.svg b/src/resources/icons/float.svg new file mode 100644 index 00000000..50029f9a --- /dev/null +++ b/src/resources/icons/float.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/src/resources/vnote.qss b/src/resources/vnote.qss index 4b39ec07..83820997 100644 --- a/src/resources/vnote.qss +++ b/src/resources/vnote.qss @@ -80,6 +80,11 @@ QMenuBar::item:selected { } /* DockWidget */ +QDockWidget { + titlebar-close-icon: url(:/resources/icons/close.svg); + titlebar-normal-icon: url(:/resources/icons/float.svg); +} + QDockWidget::Title { background: @base-color; } @@ -91,6 +96,10 @@ QDockWidget::close-button, QDockWidget::float-button { QDockWidget::close-button:hover, QDockWidget::float-button:hover { background-color: @hover-color; } + +QDockWidget::close-button:focus, QDockWidget::float-button:focus { + background-color: @focus-color; +} /* End DockWidget */ /* QComboBox#NotebookSelector */ @@ -189,3 +198,16 @@ QWidget[NotebookPanel="true"] { padding-left: 3px; } +QTabBar::close-button { + image: url(:/resources/icons/close_grey.svg); +} + +QTabBar::close-button:hover { + image: url(:/resources/icons/close.svg); + background-color: @hover-color; +} + +QTabBar::close-button:focus { + image: url(:/resources/icons/close.svg); + background-color: @focus-color; +} diff --git a/src/utils/vutils.cpp b/src/utils/vutils.cpp index 4e19c165..a0c380b1 100644 --- a/src/utils/vutils.cpp +++ b/src/utils/vutils.cpp @@ -13,6 +13,7 @@ #include #include #include +#include const QVector> VUtils::c_availableLanguages = {QPair("en_US", "Englisth(US)"), QPair("zh_CN", "Chinese")}; @@ -356,6 +357,6 @@ qreal VUtils::calculateScaleFactor() bool VUtils::realEqual(qreal p_a, qreal p_b) { - return abs(p_a - p_b) < 1e-8; + return std::abs(p_a - p_b) < 1e-8; } diff --git a/src/vnote.qrc b/src/vnote.qrc index 0b6b5138..9ef5a181 100644 --- a/src/vnote.qrc +++ b/src/vnote.qrc @@ -94,5 +94,8 @@ utils/mermaid/mermaid.dark.css utils/mermaid/mermaid.forest.css utils/mermaid/mermaidAPI.min.js + resources/icons/close_red.svg + resources/icons/close_grey.svg + resources/icons/float.svg