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

Update DockConstants , DockmodeData and Dock style

Browse Source
This commit is contained in:
杨万青 2015-07-14 16:11:46 +08:00
parent f730c2fca8
commit d0a5113b09
5 changed files with 98 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dde-dock/Resources/qss/default.qss
View File

@ -1,31 +1,27 @@
QLabel#Panel {
background-color: rgba(0,0,0,0.3);
background-color: rgba(0,0,0,0.7);
}
QLabel#AppBackground[isCurrentOpened="true"][isHovered="true"] {/*item is current opened and is hovered*/
background: rgba(0,255,255,0.5);
border-width: 1px;
border-style: solid;
border-color: rgba(255,255,255,0.3);
background: rgba(0,188,255,0.80);
border: 1px solid rgba(79,174,249,0.50);
/*box-shadow: inset 0px -4px 0px 0px #01BDFF, inset 0px 0px 1px 2px rgba(25,210,255,0.20);*/
border-radius: 2px;
}
QLabel#AppBackground[isCurrentOpened="true"][isHovered="false"] {/*item is current opened but not hovered*/
background: rgba(0,255,255,0.4);
border-width: 1px;
border-style: solid;
border-color: rgba(255,255,255,0.3);
background: rgba(0,188,255,0.60);
border: 1px solid rgba(79,174,249,0.50);
/*box-shadow: inset 0px -4px 0px 0px #01BDFF, inset 0px 0px 1px 2px rgba(25,210,255,0.20);*/
border-radius: 2px;
}
QLabel#AppBackground[isActived="true"][isHovered="true"][isCurrentOpened="false"] {/*item is actived and hovered*/
background: rgba(255,255,255,0.3);
border-width: 1px;
border-style: solid;
border-color: rgba(255,255,255,0.3);
background: rgba(255,255,255,0.40);
border-radius: 2px;
}
QLabel#AppBackground[isActived="true"][isHovered="false"][isCurrentOpened="false"] {/*item is actived but not hovered*/
background: rgba(255,255,255,0.15);
border-width: 1px;
border-style: solid;
border-color: rgba(255,255,255,0.3);
background: rgba(255,255,255,0.20);
border-radius: 2px;
}
QLabel#panelMenuContent {

80
dde-dock/src/Controller/dockmodedata.cpp
View File

@ -40,13 +40,13 @@ int DockModeData::getDockHeight()
switch (m_currentMode)
{
case Dock::FashionMode:
return 60;
return Dock::PANEL_FASHION_HEIGHT;
case Dock::EfficientMode:
return 50;
return Dock::PANEL_EFFICIENT_HEIGHT;
case Dock::ClassicMode:
return 40;
return Dock::PANEL_CLASSIC_HEIGHT;
default:
return 40;
return Dock::PANEL_FASHION_HEIGHT;
}
}
@ -55,13 +55,13 @@ int DockModeData::getItemHeight()
switch (m_currentMode)
{
case Dock::FashionMode:
return 60;
return Dock::APP_ITEM_FASHION_HEIGHT;
case Dock::EfficientMode:
return 50;
return Dock::APP_ITEM_EFFICIENT_HEIGHT;
case Dock::ClassicMode:
return 40;
return Dock::APP_ITEM_CLASSIC_HEIGHT;
default:
return 40;
return Dock::APP_ITEM_FASHION_HEIGHT;
}
}
@ -70,13 +70,13 @@ int DockModeData::getNormalItemWidth()
switch (m_currentMode)
{
case Dock::FashionMode:
return 60;
return Dock::APP_ITEM_FASHION_NORMAL_WIDTH;
case Dock::EfficientMode:
return 60;
return Dock::APP_ITEM_EFFICIENT_NORMAL_WIDTH;
case Dock::ClassicMode:
return 40;
return Dock::APP_ITEM_CLASSIC_NORMAL_WIDTH;
default:
return 40;
return Dock::APP_ITEM_FASHION_NORMAL_WIDTH;
}
}
@ -85,13 +85,13 @@ int DockModeData::getActivedItemWidth()
switch (m_currentMode)
{
case Dock::FashionMode:
return 60;
return Dock::APP_ITEM_FASHION_ACTIVE_WIDTH;
case Dock::EfficientMode:
return 60;
return Dock::APP_ITEM_EFFICIENT_ACTIVE_WIDTH;
case Dock::ClassicMode:
return 150;
return Dock::APP_ITEM_CLASSIC_ACTIVE_WIDTH;
default:
return 60;
return Dock::APP_ITEM_FASHION_ACTIVE_WIDTH;
}
}
@ -100,13 +100,13 @@ int DockModeData::getAppItemSpacing()
switch (m_currentMode)
{
case Dock::FashionMode:
return 10;
return Dock::APP_ITEM_FASHION_SPACING;
case Dock::EfficientMode:
return 15;
return Dock::APP_ITEM_EFFICIENT_SPACING;
case Dock::ClassicMode:
return 8;
return Dock::APP_ITEM_CLASSIC_SPACING;
default:
return 8;
return Dock::APP_ITEM_FASHION_SPACING;
}
}
@ -115,13 +115,13 @@ int DockModeData::getAppIconSize()
switch (m_currentMode)
{
case Dock::FashionMode:
return 48;
return Dock::APP_ITEM_FASHION_ICON_SIZE;
case Dock::EfficientMode:
return 48;
return Dock::APP_ITEM_EFFICIENT_ICON_SIZE;
case Dock::ClassicMode:
return 32;
return Dock::APP_ITEM_CLASSIC_ICON_SIZE;
default:
return 32;
return Dock::APP_ITEM_FASHION_ICON_SIZE;
}
}
@ -130,13 +130,13 @@ int DockModeData::getAppletsItemHeight()
switch (m_currentMode)
{
case Dock::FashionMode:
return 60;
return Dock::APPLET_FASHION_ITEM_HEIGHT;
case Dock::EfficientMode:
return 50;
return Dock::APPLET_EFFICIENT_ITEM_HEIGHT;
case Dock::ClassicMode:
return 40;
return Dock::APPLET_CLASSIC_ITEM_HEIGHT;
default:
return 40;
return Dock::APPLET_FASHION_ITEM_HEIGHT;
}
}
@ -145,13 +145,13 @@ int DockModeData::getAppletsItemWidth()
switch (m_currentMode)
{
case Dock::FashionMode:
return 60;
return Dock::APPLET_FASHION_ITEM_WIDTH;
case Dock::EfficientMode:
return 50;
return Dock::APPLET_EFFICIENT_ITEM_WIDTH;
case Dock::ClassicMode:
return 50;
return Dock::APPLET_CLASSIC_ITEM_WIDTH;
default:
return 50;
return Dock::APPLET_FASHION_ITEM_WIDTH;
}
}
@ -160,13 +160,13 @@ int DockModeData::getAppletsItemSpacing()
switch (m_currentMode)
{
case Dock::FashionMode:
return 10;
return Dock::APPLET_FASHION_ITEM_SPACING;
case Dock::EfficientMode:
return 10;
return Dock::APPLET_EFFICIENT_ITEM_SPACING;
case Dock::ClassicMode:
return 10;
return Dock::APPLET_CLASSIC_ITEM_SPACING;
default:
return 10;
return Dock::APPLET_FASHION_ITEM_SPACING;
}
}
@ -175,13 +175,13 @@ int DockModeData::getAppletsIconSize()
switch (m_currentMode)
{
case Dock::FashionMode:
return 48;
return Dock::APPLET_FASHION_ICON_SIZE;
case Dock::EfficientMode:
return 24;
return Dock::APPLET_EFFICIENT_ICON_SIZE;
case Dock::ClassicMode:
return 24;
return Dock::APPLET_CLASSIC_ICON_SIZE;
default:
return 24;
return Dock::APPLET_FASHION_ICON_SIZE;
}
}

1
dde-dock/src/Controller/dockmodedata.h
View File

@ -24,6 +24,7 @@ public:
int getActivedItemWidth();
int getAppItemSpacing();
int getAppIconSize();
int getAppletsItemHeight();
int getAppletsItemWidth();
int getAppletsItemSpacing();

18
dde-dock/src/Panel/panel.cpp
View File

@ -12,12 +12,12 @@ Panel::Panel(QWidget *parent)
rightLayout = new DockLayout(this);
rightLayout->setSortDirection(DockLayout::RightToLeft);
rightLayout->setSpacing(dockCons->getAppletsItemSpacing());
rightLayout->resize(80,dockCons->getDockHeight());
rightLayout->resize(80,dockCons->getItemHeight());
leftLayout = new DockLayout(this);
leftLayout->setSpacing(dockCons->getAppItemSpacing());
leftLayout->resize(this->width() - rightLayout->width(),dockCons->getDockHeight());
leftLayout->move(0,0);
leftLayout->resize(this->width() - rightLayout->width(),dockCons->getItemHeight());
leftLayout->move(0,1);
connect(leftLayout,SIGNAL(dragStarted()),this,SLOT(slotDragStarted()));
connect(leftLayout,SIGNAL(itemDropped()),this,SLOT(slotItemDropped()));
@ -140,10 +140,10 @@ void Panel::reanchorsLayout(Dock::DockMode mode)
{
if (mode == Dock::FashionMode)
{
leftLayout->resize(leftLayout->getContentsWidth() + dockCons->getAppItemSpacing(),dockCons->getDockHeight());
leftLayout->resize(leftLayout->getContentsWidth() + dockCons->getAppItemSpacing(),dockCons->getItemHeight());
rightLayout->setSortDirection(DockLayout::LeftToRight);
rightLayout->resize(rightLayout->getContentsWidth(),dockCons->getDockHeight());
rightLayout->move(leftLayout->width() - dockCons->getAppItemSpacing(),0);
rightLayout->resize(rightLayout->getContentsWidth(),dockCons->getItemHeight());
rightLayout->move(leftLayout->width() - dockCons->getAppItemSpacing(),1);
this->resize(leftLayout->getContentsWidth() + rightLayout->getContentsWidth(),dockCons->getDockHeight());
this->move((parentWidget->width() - leftLayout->getContentsWidth() - rightLayout->getContentsWidth()) / 2,0);
@ -151,10 +151,10 @@ void Panel::reanchorsLayout(Dock::DockMode mode)
else
{
rightLayout->setSortDirection(DockLayout::RightToLeft);
rightLayout->resize(rightLayout->getContentsWidth(),dockCons->getDockHeight());
rightLayout->move(parentWidget->width() - rightLayout->width(),0);
rightLayout->resize(rightLayout->getContentsWidth(),dockCons->getItemHeight());
rightLayout->move(parentWidget->width() - rightLayout->width(),1);
leftLayout->resize(parentWidget->width() - rightLayout->width() ,dockCons->getDockHeight());
leftLayout->resize(parentWidget->width() - rightLayout->width() ,dockCons->getItemHeight());
this->resize(leftLayout->width() + rightLayout->width(),dockCons->getDockHeight());
this->move((parentWidget->width() - leftLayout->width() - rightLayout->width()) / 2,0);

44
dde-dock/src/dockconstants.h
View File

@ -15,24 +15,50 @@ enum HideMode {
SmartHide = 3
};
//////////////// App ////////////////////////////////
const int APP_PREVIEW_WIDTH = 160;
const int APP_PREVIEW_HEIGHT = 100;
const int APP_PREVIEW_MARGIN = 18 ;
const int APPLET_FASHION_ITEM_HEIGHT = 60;
const int APPLET_FASHION_ITEM_WIDTH = 60;
const int APPLET_FASHION_ITEM_SPACING = 10;
const int APP_ITEM_FASHION_HEIGHT = 48;
const int APP_ITEM_FASHION_NORMAL_WIDTH = 48;
const int APP_ITEM_FASHION_ACTIVE_WIDTH = 48;
const int APP_ITEM_FASHION_SPACING = 3;
const int APP_ITEM_FASHION_ICON_SIZE = 48;
const int APP_ITEM_EFFICIENT_HEIGHT = 46;
const int APP_ITEM_EFFICIENT_NORMAL_WIDTH = 64;
const int APP_ITEM_EFFICIENT_ACTIVE_WIDTH = 64;
const int APP_ITEM_EFFICIENT_SPACING = 4;
const int APP_ITEM_EFFICIENT_ICON_SIZE = 32;
const int APP_ITEM_CLASSIC_HEIGHT = 34;
const int APP_ITEM_CLASSIC_NORMAL_WIDTH = 48;
const int APP_ITEM_CLASSIC_ACTIVE_WIDTH = 160;
const int APP_ITEM_CLASSIC_SPACING = 4;
const int APP_ITEM_CLASSIC_ICON_SIZE = 24;
//////////////// APpplet ////////////////////////////
const int APPLET_FASHION_ITEM_HEIGHT = 48;
const int APPLET_FASHION_ITEM_WIDTH = 48;
const int APPLET_FASHION_ITEM_SPACING = 3;
const int APPLET_FASHION_ICON_SIZE = 48;
const int APPLET_EFFICIENT_ITEM_HEIGHT = 50;
const int APPLET_EFFICIENT_ITEM_WIDTH = 50;
const int APPLET_EFFICIENT_ITEM_HEIGHT = 16;
const int APPLET_EFFICIENT_ITEM_WIDTH = 16;
const int APPLET_EFFICIENT_ITEM_SPACING = 10;
const int APPLET_EFFICIENT_ICON_SIZE = 24;
const int APPLET_EFFICIENT_ICON_SIZE = 16;
const int APPLET_CLASSIC_ITEM_HEIGHT = 40;
const int APPLET_CLASSIC_ITEM_WIDTH = 50;
const int APPLET_CLASSIC_ITEM_HEIGHT = 16;
const int APPLET_CLASSIC_ITEM_WIDTH = 16;
const int APPLET_CLASSIC_ITEM_SPACING = 10;
const int APPLET_CLASSIC_ICON_SIZE = 24;
const int APPLET_CLASSIC_ICON_SIZE = 16;
///////////// Panel ////////////////////////////////
const int PANEL_FASHION_HEIGHT = 70;
const int PANEL_EFFICIENT_HEIGHT = 48;
const int PANEL_CLASSIC_HEIGHT = 36;
}
#endif // DOCKCONSTANTS_H