[neon/backports-noble/kcolorpicker-noble/Neon/unstable] /: New upstream version 0.1.5~git20201226
Boyuan Yang
null at kde.org
Wed Jul 3 15:10:15 BST 2024
Git commit cfe458736d103373636ccfe4cb0902c922758b26 by Boyuan Yang.
Committed on 27/12/2020 at 02:31.
Pushed by jriddell into branch 'Neon/unstable'.
New upstream version 0.1.5~git20201226
M +3 -2 CMakeLists.txt
M +1 -1 README.md
M +1 -1 src/PopupMenu.cpp
M +2 -2 src/buttons/AbstractPopupMenuButton.cpp
https://invent.kde.org/neon/backports-noble/kcolorpicker-noble/-/commit/cfe458736d103373636ccfe4cb0902c922758b26
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a765bc..24f793b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5)
-project(kColorPicker LANGUAGES CXX VERSION 0.1.4)
+project(kColorPicker LANGUAGES CXX VERSION 0.1.5)
set(QT_MIN_VERSION "5.9.4")
@@ -56,7 +56,8 @@ set_target_properties(kColorPicker
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin
- SOVERSION ${PROJECT_VERSION}
+ VERSION ${PROJECT_VERSION}
+ SOVERSION 0
)
install(TARGETS kColorPicker
diff --git a/README.md b/README.md
index de087ca..64371f8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# kColorPicker [![Build Status](https://travis-ci.org/ksnip/kColorPicker.svg?branch=master)](https://travis-ci.org/ksnip/kColorPicker)
QToolButton with color popup menu with lets you select a color. The popup features a color dialog button which can be used to add custom colors to the popup menu.
-Version 0.1.4
+Version 0.1.5
![kColorPicker](https://i.imgur.com/VkhUvFa.png "kColorPicker")
diff --git a/src/PopupMenu.cpp b/src/PopupMenu.cpp
index 3c8ad14..e98e2d5 100644
--- a/src/PopupMenu.cpp
+++ b/src/PopupMenu.cpp
@@ -116,7 +116,7 @@ void PopupMenu::colorSelected(const QColor &color)
void PopupMenu::addColorDialogButton()
{
- auto icon = QIcon(QStringLiteral(":/icons/ellipsis"));
+ auto icon = QIcon(QLatin1String(":/icons/ellipsis"));
mColorDialogButton = new ColorDialogButton(icon);
connect(mColorDialogButton, &AbstractPopupMenuButton::colorSelected, this, &PopupMenu::colorSelected);
}
diff --git a/src/buttons/AbstractPopupMenuButton.cpp b/src/buttons/AbstractPopupMenuButton.cpp
index 16b27e6..4dad7fa 100644
--- a/src/buttons/AbstractPopupMenuButton.cpp
+++ b/src/buttons/AbstractPopupMenuButton.cpp
@@ -22,7 +22,7 @@
namespace kColorPicker {
AbstractPopupMenuButton::AbstractPopupMenuButton(const QIcon &icon) :
- mHoverColor(QColor(QStringLiteral("#add8e6")))
+ mHoverColor(QColor(QLatin1String("#add8e6")))
{
setIcon(icon);
setFixedSize(iconSize() + QSize(8, 8));
@@ -36,7 +36,7 @@ void AbstractPopupMenuButton::paintEvent(QPaintEvent *event)
styleOption.initFrom(this);
auto rect = event->rect();
auto scaleRatio = devicePixelRatioF();
- auto buttonRect = QRectF(rect.x() + (2 / scaleRatio), rect.y() + (2 / scaleRatio), rect.width() - 3, rect.height() - 3);
+ auto buttonRect = QRectF(rect.x() + (2 / scaleRatio), rect.y() + (2 / scaleRatio), rect.width() - 5, rect.height() - 5);
if(styleOption.state & QStyle::State_MouseOver)
{
More information about the Neon-commits
mailing list