Skip to content

Commit

Permalink
fix: extrend close button area
Browse files Browse the repository at this point in the history 
Change-Id: I72d4ef08f020ab185246ce9f7018d0bb3714e546
  • Loading branch information
@Iceyer
Iceyer committed Oct 18, 2018
1 parent 8588ab0 commit 07149b5
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 65 deletions.
62 changes: 30 additions & 32 deletions src/music-player/resource/theme/dark/Titlebar.theme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,72 +14,70 @@ Dtk--Widget--DTitlebar[viewname="lyric"] {
/* ------ #DTitlebarDWindowOptionButton ------ */

#DTitlebarDWindowOptionButton {
qproperty-normalPic: url(:/dark/image/window/menu_normal.svg);
qproperty-hoverPic: url(:/dark/image/window/menu_hover.svg);
qproperty-pressPic: url(:/dark/image/window/menu_press.svg);
qproperty-normalPic: url(:/images/dark/images/window/menu_normal.svg);
qproperty-hoverPic: url(:/images/dark/images/window/menu_hover.svg);
qproperty-pressPic: url(:/images/dark/images/window/menu_press.svg);
}

#DTitlebarDWindowOptionButton[viewname="lyric"] {
qproperty-normalPic: url(:/dark/image/window/menu_normal.svg);
qproperty-hoverPic: url(:/dark/image/window/menu_hover.svg);
qproperty-pressPic: url(:/dark/image/window/menu_press.svg);
qproperty-normalPic: url(:/images/dark/images/window/menu_normal.svg);
qproperty-hoverPic: url(:/images/dark/images/window/menu_hover.svg);
qproperty-pressPic: url(:/images/dark/images/window/menu_press.svg);
}


/* ------ #DTitlebarDWindowMinButton ------ */

#DTitlebarDWindowMinButton {
qproperty-normalPic: url(:/dark/image/window/minimise_normal.svg);
qproperty-hoverPic: url(:/dark/image/window/minimise_hover.svg);
qproperty-pressPic: url(:/dark/image/window/minimise_press.svg);
qproperty-normalPic: url(:/images/dark/images/window/minimize_normal.svg);
qproperty-hoverPic: url(:/images/dark/images/window/minimize_hover.svg);
qproperty-pressPic: url(:/images/dark/images/window/minimize_press.svg);
}

#DTitlebarDWindowMinButton[viewname="lyric"] {
qproperty-normalPic: url(:/dark/image/window/minimise_normal.svg);
qproperty-hoverPic: url(:/dark/image/window/minimise_hover.svg);
qproperty-pressPic: url(:/dark/image/window/minimise_press.svg);
qproperty-normalPic: url(:/images/dark/images/window/minimize_normal.svg);
qproperty-hoverPic: url(:/images/dark/images/window/minimize_hover.svg);
qproperty-pressPic: url(:/images/dark/images/window/minimize_press.svg);
}


/* ------ #DTitlebarDWindowMaxButton ------ */

#DTitlebarDWindowMaxButton[isMaximized=true] {
qproperty-normalPic: url(:/dark/image/window/unmaximize_normal.svg);
qproperty-hoverPic: url(:/dark/image/window/unmaximize_hover.svg);
qproperty-pressPic: url(:/dark/image/window/unmaximize_press.svg);
qproperty-normalPic: url(:/images/dark/images/window/unmaximize_normal.svg);
qproperty-hoverPic: url(:/images/dark/images/window/unmaximize_hover.svg);
qproperty-pressPic: url(:/images/dark/images/window/unmaximize_press.svg);
}

#DTitlebarDWindowMaxButton[isMaximized=false] {
qproperty-normalPic: url(:/dark/image/window/maximize_normal.svg);
qproperty-hoverPic: url(:/dark/image/window/maximize_hover.svg);
qproperty-pressPic: url(:/dark/image/window/maximize_press.svg);
qproperty-normalPic: url(:/images/dark/images/window/maximize_normal.svg);
qproperty-hoverPic: url(:/images/dark/images/window/maximize_hover.svg);
qproperty-pressPic: url(:/images/dark/images/window/maximize_press.svg);
}

#DTitlebarDWindowMaxButton[isMaximized=true][viewname="lyric"] {
qproperty-normalPic: url(:/dark/image/window/unmaximize_normal.svg);
qproperty-hoverPic: url(:/dark/image/window/unmaximize_hover.svg);
qproperty-pressPic: url(:/dark/image/window/unmaximize_press.svg);
qproperty-normalPic: url(:/images/dark/images/window/unmaximize_normal.svg);
qproperty-hoverPic: url(:/images/dark/images/window/unmaximize_hover.svg);
qproperty-pressPic: url(:/images/dark/images/window/unmaximize_press.svg);
}

#DTitlebarDWindowMaxButton[isMaximized=false][viewname="lyric"] {
qproperty-normalPic: url(:/dark/image/window/maximize_normal.svg);
qproperty-hoverPic: url(:/dark/image/window/maximize_hover.svg);
qproperty-pressPic: url(:/dark/image/window/maximize_press.svg);
qproperty-normalPic: url(:/images/dark/images/window/maximize_normal.svg);
qproperty-hoverPic: url(:/images/dark/images/window/maximize_hover.svg);
qproperty-pressPic: url(:/images/dark/images/window/maximize_press.svg);
}


/* ------ #DTitlebarDWindowCloseButton ------ */

#DTitlebarDWindowCloseButton {
qproperty-normalPic: url(:/dark/image/window/close_normal.svg);
qproperty-hoverPic: url(:/dark/image/window/close_hover.svg);
qproperty-pressPic: url(:/dark/image/window/close_press.svg);
padding-right: 6px;
qproperty-normalPic: url(:/images/dark/images/window/close_normal.svg);
qproperty-hoverPic: url(:/images/dark/images/window/close_hover.svg);
qproperty-pressPic: url(:/images/dark/images/window/close_press.svg);
}

#DTitlebarDWindowCloseButton[viewname="lyric"] {
qproperty-normalPic: url(:/dark/image/window/close_normal.svg);
qproperty-hoverPic: url(:/dark/image/window/close_hover.svg);
qproperty-pressPic: url(:/dark/image/window/close_press.svg);
padding-right: 6px;
qproperty-normalPic: url(:/images/dark/images/window/close_normal.svg);
qproperty-hoverPic: url(:/images/dark/images/window/close_hover.svg);
qproperty-pressPic: url(:/images/dark/images/window/close_press.svg);
}
62 changes: 30 additions & 32 deletions src/music-player/resource/theme/light/Titlebar.theme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,72 +13,70 @@ Dtk--Widget--DTitlebar[viewname="lyric"] {
/* ------ #DTitlebarDWindowOptionButton ------ */

#DTitlebarDWindowOptionButton {
qproperty-normalPic: url(:/light/image/window/menu_normal.svg);
qproperty-hoverPic: url(:/light/image/window/menu_hover.svg);
qproperty-pressPic: url(:/light/image/window/menu_press.svg);
qproperty-normalPic: url(:/images/light/images/window/menu_normal.svg);
qproperty-hoverPic: url(:/images/light/images/window/menu_hover.svg);
qproperty-pressPic: url(:/images/light/images/window/menu_press.svg);
}

#DTitlebarDWindowOptionButton[viewname="lyric"] {
qproperty-normalPic: url(:/dark/image/window/menu_normal.svg);
qproperty-hoverPic: url(:/dark/image/window/menu_hover.svg);
qproperty-pressPic: url(:/dark/image/window/menu_press.svg);
qproperty-normalPic: url(:/images/dark/images/window/menu_normal.svg);
qproperty-hoverPic: url(:/images/dark/images/window/menu_hover.svg);
qproperty-pressPic: url(:/images/dark/images/window/menu_press.svg);
}


/* ------ #DTitlebarDWindowMinButton ------ */

#DTitlebarDWindowMinButton {
qproperty-normalPic: url(:/light/image/window/minimise_normal.svg);
qproperty-hoverPic: url(:/light/image/window/minimise_hover.svg);
qproperty-pressPic: url(:/light/image/window/minimise_press.svg);
qproperty-normalPic: url(:/images/light/images/window/minimize_normal.svg);
qproperty-hoverPic: url(:/images/light/images/window/minimize_hover.svg);
qproperty-pressPic: url(:/images/light/images/window/minimize_press.svg);
}

#DTitlebarDWindowMinButton[viewname="lyric"] {
qproperty-normalPic: url(:/dark/image/window/minimise_normal.svg);
qproperty-hoverPic: url(:/dark/image/window/minimise_hover.svg);
qproperty-pressPic: url(:/dark/image/window/minimise_press.svg);
qproperty-normalPic: url(:/images/dark/images/window/minimize_normal.svg);
qproperty-hoverPic: url(:/images/dark/images/window/minimize_hover.svg);
qproperty-pressPic: url(:/images/dark/images/window/minimize_press.svg);
}


/* ------ #DTitlebarDWindowMaxButton ------ */

#DTitlebarDWindowMaxButton[isMaximized=true] {
qproperty-normalPic: url(:/light/image/window/unmaximize_normal.svg);
qproperty-hoverPic: url(:/light/image/window/unmaximize_hover.svg);
qproperty-pressPic: url(:/light/image/window/unmaximize_press.svg);
qproperty-normalPic: url(:/images/light/images/window/unmaximize_normal.svg);
qproperty-hoverPic: url(:/images/light/images/window/unmaximize_hover.svg);
qproperty-pressPic: url(:/images/light/images/window/unmaximize_press.svg);
}

#DTitlebarDWindowMaxButton[isMaximized=false] {
qproperty-normalPic: url(:/light/image/window/maximize_normal.svg);
qproperty-hoverPic: url(:/light/image/window/maximize_hover.svg);
qproperty-pressPic: url(:/light/image/window/maximize_press.svg);
qproperty-normalPic: url(:/images/light/images/window/maximize_normal.svg);
qproperty-hoverPic: url(:/images/light/images/window/maximize_hover.svg);
qproperty-pressPic: url(:/images/light/images/window/maximize_press.svg);
}

#DTitlebarDWindowMaxButton[isMaximized=true][viewname="lyric"] {
qproperty-normalPic: url(:/dark/image/window/unmaximize_normal.svg);
qproperty-hoverPic: url(:/dark/image/window/unmaximize_hover.svg);
qproperty-pressPic: url(:/dark/image/window/unmaximize_press.svg);
qproperty-normalPic: url(:/images/dark/images/window/unmaximize_normal.svg);
qproperty-hoverPic: url(:/images/dark/images/window/unmaximize_hover.svg);
qproperty-pressPic: url(:/images/dark/images/window/unmaximize_press.svg);
}

#DTitlebarDWindowMaxButton[isMaximized=false][viewname="lyric"] {
qproperty-normalPic: url(:/dark/image/window/maximize_normal.svg);
qproperty-hoverPic: url(:/dark/image/window/maximize_hover.svg);
qproperty-pressPic: url(:/dark/image/window/maximize_press.svg);
qproperty-normalPic: url(:/images/dark/images/window/maximize_normal.svg);
qproperty-hoverPic: url(:/images/dark/images/window/maximize_hover.svg);
qproperty-pressPic: url(:/images/dark/images/window/maximize_press.svg);
}


/* ------ #DTitlebarDWindowCloseButton ------ */

#DTitlebarDWindowCloseButton {
qproperty-normalPic: url(:/light/image/window/close_normal.svg);
qproperty-hoverPic: url(:/light/image/window/close_hover.svg);
qproperty-pressPic: url(:/light/image/window/close_press.svg);
padding-right: 6px;
qproperty-normalPic: url(:/images/light/images/window/close_normal.svg);
qproperty-hoverPic: url(:/images/light/images/window/close_hover.svg);
qproperty-pressPic: url(:/images/light/images/window/close_press.svg);
}

#DTitlebarDWindowCloseButton[viewname="lyric"] {
qproperty-normalPic: url(:/dark/image/window/close_normal.svg);
qproperty-hoverPic: url(:/dark/image/window/close_hover.svg);
qproperty-pressPic: url(:/dark/image/window/close_press.svg);
padding-right: 6px;
qproperty-normalPic: url(:/images/dark/images/window/close_normal.svg);
qproperty-hoverPic: url(:/images/dark/images/window/close_hover.svg);
qproperty-pressPic: url(:/images/dark/images/window/close_press.svg);
}
2 changes: 1 addition & 1 deletion src/music-player/view/musiclistwidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

#include "musiclistwidget.h"

#include <QDebug>
#include <QAction>
#include <QVBoxLayout>
#include <QHBoxLayout>
Expand All @@ -32,7 +33,6 @@
#include <QStandardItemModel>

#include <DThemeManager>
#include <dcombobox.h>

#include "../core/music.h"
#include "../core/playlist.h"
Expand Down

0 comments on commit 07149b5

Please sign in to comment.