Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

using svg close button image

Browse Source 
Change-Id: I6cbee108ee812fbba005b37b3169e9893cbe42f9
This commit is contained in:
石博文 2017-10-10 17:05:23 +08:00
parent b91bae6801
commit a49c79255b
No known key found for this signature in database
GPG Key ID: FC9610D6400A173C
Notes: Deepin Code Review 2017-10-10 17:09:06 +08:00 
Verified+1: Anonymous Coward #1000004
Code-Review+2: 石博文 <sbw@sbw.so>
Submitted-by: 石博文 <sbw@sbw.so>
Submitted-at: Tue, 10 Oct 2017 17:09:06 +0800
Reviewed-on: https://cr.deepin.io/26878
Project: dde/dde-dock
Branch: refs/heads/master
8 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frame/item/components/floatingpreview.cpp
View File

@ -32,9 +32,9 @@ FloatingPreview::FloatingPreview(QWidget *parent)
m_closeBtn(new DImageButton)
{
m_closeBtn->setFixedSize(24, 24);
m_closeBtn->setNormalPic(":/icons/resources/close_round_normal.png");
m_closeBtn->setHoverPic(":/icons/resources/close_round_hover.png");
m_closeBtn->setPressPic(":/icons/resources/close_round_press.png");
m_closeBtn->setNormalPic(":/icons/resources/close_round_normal.svg");
m_closeBtn->setHoverPic(":/icons/resources/close_round_hover.svg");
m_closeBtn->setPressPic(":/icons/resources/close_round_press.svg");
QVBoxLayout *centralLayout = new QVBoxLayout;
centralLayout->addWidget(m_closeBtn);

6
frame/item/resources.qrc
View File

@ -11,8 +11,8 @@
<file>resources/arrow-left.svg</file>
<file>resources/arrow-down.svg</file>
<file>resources/application-x-desktop.svg</file>
<file>resources/close_round_press.png</file>
<file>resources/close_round_normal.png</file>
<file>resources/close_round_hover.png</file>
<file>resources/close_round_hover.svg</file>
<file>resources/close_round_press.svg</file>
<file>resources/close_round_normal.svg</file>
</qresource>
</RCC>

BIN
frame/item/resources/close_round_hover.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 587 B

15
frame/item/resources/close_round_hover.svg Executable file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
<title>close_round_hover</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="最大化最小化" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="close_round_hover">
<g id="close_round" transform="translate(3.000000, 3.000000)">
<circle id="Oval" fill-opacity="0.5" fill="#E8E8E8" cx="9" cy="9" r="9"></circle>
<polygon id="Combined-Shape" fill="#F27E00" fill-rule="nonzero" points="9.24264069 9.94974747 6.06066017 13.131728 5.70710678 13.4852814 5 12.7781746 5.35355339 12.4246212 8.53553391 9.24264069 5.35355339 6.06066017 5 5.70710678 5.70710678 5 6.06066017 5.35355339 9.24264069 8.53553391 12.4246212 5.35355339 12.7781746 5 13.4852814 5.70710678 13.131728 6.06066017 9.94974747 9.24264069 13.131728 12.4246212 13.4852814 12.7781746 12.7781746 13.4852814 12.4246212 13.131728"></polygon>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
frame/item/resources/close_round_normal.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 567 B

15
frame/item/resources/close_round_normal.svg Executable file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
<title>close_round_normal</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="最大化最小化" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="close_round_normal">
<g id="close_round" transform="translate(3.000000, 3.000000)">
<circle id="Oval" fill-opacity="0.8" fill="#FFFFFF" cx="9" cy="9" r="9"></circle>
<polygon id="Combined-Shape" fill="#000000" fill-rule="nonzero" points="9.24264069 9.94974747 6.06066017 13.131728 5.70710678 13.4852814 5 12.7781746 5.35355339 12.4246212 8.53553391 9.24264069 5.35355339 6.06066017 5 5.70710678 5.70710678 5 6.06066017 5.35355339 9.24264069 8.53553391 12.4246212 5.35355339 12.7781746 5 13.4852814 5.70710678 13.131728 6.06066017 9.94974747 9.24264069 13.131728 12.4246212 13.4852814 12.7781746 12.7781746 13.4852814 12.4246212 13.131728"></polygon>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
frame/item/resources/close_round_press.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 587 B

15
frame/item/resources/close_round_press.svg Executable file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
<title>close_round_press</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="最大化最小化" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="close_round_press">
<g id="close_round" transform="translate(3.000000, 3.000000)">
<circle id="Oval" fill-opacity="0.5" fill="#949494" cx="9" cy="9" r="9"></circle>
<polygon id="Combined-Shape" fill="#FF3663" fill-rule="nonzero" points="9.24264069 9.94974747 6.06066017 13.131728 5.70710678 13.4852814 5 12.7781746 5.35355339 12.4246212 8.53553391 9.24264069 5.35355339 6.06066017 5 5.70710678 5.70710678 5 6.06066017 5.35355339 9.24264069 8.53553391 12.4246212 5.35355339 12.7781746 5 13.4852814 5.70710678 13.131728 6.06066017 9.94974747 9.24264069 13.131728 12.4246212 13.4852814 12.7781746 12.7781746 13.4852814 12.4246212 13.131728"></polygon>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB