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

fix panel size calculate wrong

Browse Source 
Change-Id: I26f4fc1a4e54585e03030107b03c607109b5223a
This commit is contained in:
石博文 2016-07-12 15:59:45 +08:00 committed by Hualet Wang
parent 09bc85fa99
commit bbf96e1bfc
3 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
frame/panel/mainpanel.cpp
View File

@ -21,7 +21,7 @@ MainPanel::MainPanel(QWidget *parent)
setAcceptDrops(true);
setObjectName("MainPanel");
setStyleSheet("QWidget #MainPanel {"
"border:1px solid rgba(162, 162, 162, .2);"
"border:" str(PANEL_BORDER) "px solid rgba(162, 162, 162, .2);"
"background-color:rgba(10, 10, 10, .6);"
"}"
// Top
@ -45,19 +45,19 @@ MainPanel::MainPanel(QWidget *parent)
"border-bottom-right-radius:5px;"
"}"
"QWidget #MainPanel[position='0'] {"
"padding:0 6px;"
"padding:0 " str(PANEL_PADDING) "px;"
"border-top:none;"
"}"
"QWidget #MainPanel[position='1'] {"
"padding:6px 0;"
"padding:" str(PANEL_PADDING) "px 0;"
"border-right:none;"
"}"
"QWidget #MainPanel[position='2'] {"
"padding:0 6px;"
"padding:0 " str(PANEL_PADDING) "px;"
"border-bottom:none;"
"}"
"QWidget #MainPanel[position='3'] {"
"padding:6px 0;"
"padding:" str(PANEL_PADDING) "px 0;"
"border-left:none;"
"}");
@ -192,14 +192,14 @@ void MainPanel::adjustItemSize()
{
case Top:
case Bottom:
itemSize.setHeight(height());
itemSize.setHeight(height() - PANEL_BORDER);
itemSize.setWidth(AppItem::itemBaseWidth());
break;
case Left:
case Right:
itemSize.setHeight(AppItem::itemBaseHeight());
itemSize.setWidth(width());
itemSize.setWidth(width() - PANEL_BORDER);
break;
default:
@ -250,17 +250,20 @@ void MainPanel::adjustItemSize()
}
}
const int w = width() - PANEL_BORDER * 2 - PANEL_PADDING * 2;
const int h = height() - PANEL_BORDER * 2 - PANEL_PADDING * 2;
// test if panel can display all items completely
bool containsCompletely = false;
switch (m_position)
{
case Dock::Top:
case Dock::Bottom:
containsCompletely = totalWidth <= width(); break;
containsCompletely = totalWidth <= w; break;
case Dock::Left:
case Dock::Right:
containsCompletely = totalHeight <= height(); break;
containsCompletely = totalHeight <= h; break;
default:
Q_ASSERT(false);
@ -277,13 +280,13 @@ void MainPanel::adjustItemSize()
{
// qDebug() << "width: " << totalWidth << width();
overflow = totalWidth;
base = width();
base = w;
}
else
{
// qDebug() << "height: " << totalHeight << height();
overflow = totalHeight;
base = height();
base = h;
}
const int decrease = double(overflow - base) / totalAppItemCount;

4
frame/panel/mainpanel.h
View File

@ -8,6 +8,10 @@
#include <QTimer>
#include <QBoxLayout>
#define PANEL_BORDER 1
#define PANEL_PADDING 6
#define str(x) #x
class MainPanel : public QFrame
{
Q_OBJECT

13
frame/util/docksettings.cpp
View File

@ -1,4 +1,5 @@
#include "docksettings.h"
#include "panel/mainpanel.h"
#include "item/appitem.h"
#include <QDebug>
@ -321,14 +322,14 @@ void DockSettings::calculateWindowConfig()
{
case Top:
case Bottom:
m_mainWindowSize.setHeight(defaultHeight);
m_mainWindowSize.setHeight(defaultHeight + PANEL_BORDER);
m_mainWindowSize.setWidth(m_primaryRect.width());
break;
case Left:
case Right:
m_mainWindowSize.setHeight(m_primaryRect.height());
m_mainWindowSize.setWidth(defaultWidth);
m_mainWindowSize.setWidth(defaultWidth + PANEL_BORDER);
break;
default:
@ -368,22 +369,22 @@ void DockSettings::calculateWindowConfig()
}
}
const int perfectWidth = visibleItemCount * defaultWidth;
const int perfectHeight = visibleItemCount * defaultHeight;
const int perfectWidth = visibleItemCount * defaultWidth + PANEL_BORDER * 2 + PANEL_PADDING * 2;
const int perfectHeight = visibleItemCount * defaultHeight + PANEL_BORDER * 2 + PANEL_PADDING * 2;
const int calcWidth = qMin(m_primaryRect.width(), perfectWidth);
const int calcHeight = qMin(m_primaryRect.height(), perfectHeight);
switch (m_position)
{
case Top:
case Bottom:
m_mainWindowSize.setHeight(defaultHeight);
m_mainWindowSize.setHeight(defaultHeight + PANEL_BORDER);
m_mainWindowSize.setWidth(calcWidth);
break;
case Left:
case Right:
m_mainWindowSize.setHeight(calcHeight);
m_mainWindowSize.setWidth(defaultWidth);
m_mainWindowSize.setWidth(defaultWidth + PANEL_BORDER);
break;
default: