!24 pin windget windowIcon follow theme

From: @peijiankang 
Reviewed-by: @tanyulong2021 
Signed-off-by: @tanyulong2021
This commit is contained in:
openeuler-ci-bot 2022-07-13 02:38:04 +00:00 committed by Gitee
commit f229eeaa07
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 37 additions and 2 deletions

View File

@ -0,0 +1,30 @@
From 8dcf3640346818e4540559f7e921d90fe9a0f00d Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Wed, 13 Jul 2022 10:08:57 +0800
Subject: [PATCH] pin windget windowIcon follow theme
---
src/tools/pin/pinwidget.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/tools/pin/pinwidget.cpp b/src/tools/pin/pinwidget.cpp
index 4c10ecd..0eef443 100755
--- a/src/tools/pin/pinwidget.cpp
+++ b/src/tools/pin/pinwidget.cpp
@@ -26,12 +26,11 @@
PinWidget::PinWidget(const QPixmap &pixmap, QWidget *parent) :
QWidget(parent), m_pixmap(pixmap)
{
- setWindowIcon(QIcon("/usr/share/icons/ukui-icon-theme-default/128x128/apps/kylin-screenshot.png"));
setWindowFlags(Qt::WindowStaysOnTopHint
| Qt::FramelessWindowHint);
//set the bottom widget background transparent
setAttribute(Qt::WA_TranslucentBackground);
- setMinimumWidth(300);
+ //setMinimumWidth(300);
ConfigHandler conf;
m_baseColor = conf.uiMainColorValue();
m_hoverColor = conf.uiContrastColorValue();
--
2.33.0

View File

@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: kylin-screenshot
Version: 1.0.0
Release: 13
Release: 14
Summary: a powerful screenshot and screen recording tool
License: GPL-3.0-or-later and LGPL-3.0-or-later and MIT and Apache-2.0
URL: https://github.com/ubuntukylin
@ -37,7 +37,7 @@ patch6: 0006-change-markertool-opacity.patch
patch7: 0007-change-text-property-in-time.patch
patch8: 0008-change-notify-information-about-application-name.patch
patch9: 0009-add-changelog-for-1.0.1.patch
patch10: 0010-pin-windget-windowIcon-follow-theme.patch
%description
Powerful yet simple-to-use screenshot software
@ -58,6 +58,8 @@ patch9: 0009-add-changelog-for-1.0.1.patch
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%build
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-screenshot.pro
@ -108,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/metainfo/kylinscreenshot.appdata.xml
%changelog
* Wed Jul 13 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.0-14
- pin windget windowIcon follow theme
* Mon Jul 11 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.0-13
- add changelog for 1.0.1