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

fix item w/h ratio on hidpi efficient mode

Browse Source 
Change-Id: Ic17fd74751d00b60245c63c216fe152d5972427c
This commit is contained in:
石博文 2017-09-21 16:57:56 +08:00
parent 5b7a7eece3
commit 3e6920f447
Notes: Deepin Code Review 2017-09-21 17:04:30 +08:00 
Verified+1: Anonymous Coward #1000004
Code-Review+2: 石博文 <sbw@sbw.so>
Submitted-by: 石博文 <sbw@sbw.so>
Submitted-at: Thu, 21 Sep 2017 17:04:30 +0800
Reviewed-on: https://cr.deepin.io/26530
Project: dde/dde-dock
Branch: refs/heads/master
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frame/item/appitem.cpp
View File

@ -488,7 +488,7 @@ void AppItem::startDrag()
QDrag *drag = new QDrag(this);
drag->setPixmap(dragPix);
drag->setHotSpot(dragPix.rect().center());
drag->setHotSpot(dragPix.rect().center() / dragPix.devicePixelRatioF());
drag->setMimeData(new QMimeData);
emit dragStarted();

2
frame/item/pluginsitem.cpp
View File

@ -180,7 +180,7 @@ void PluginsItem::startDrag()
QDrag *drag = new QDrag(this);
drag->setPixmap(pixmap);
drag->setHotSpot(pixmap.rect().center());
drag->setHotSpot(pixmap.rect().center() / pixmap.devicePixelRatioF());
drag->setMimeData(mime);
emit dragStarted();

6
frame/panel/mainpanel.cpp
View File

@ -430,18 +430,20 @@ void MainPanel::adjustItemSize()
{
Q_ASSERT(sender() == m_itemAdjustTimer);
const auto ratio = devicePixelRatioF();
QSize itemSize;
switch (m_position)
{
case Top:
case Bottom:
itemSize.setHeight(height() - PANEL_BORDER);
itemSize.setWidth(AppItem::itemBaseWidth());
itemSize.setWidth(AppItem::itemBaseWidth() / ratio);
break;
case Left:
case Right:
itemSize.setHeight(AppItem::itemBaseHeight());
itemSize.setHeight(AppItem::itemBaseHeight() / ratio);
itemSize.setWidth(width() - PANEL_BORDER);
break;

13
plugins/system-tray/traywidget.cpp
View File

@ -37,7 +37,7 @@
#include <xcb/composite.h>
#include <xcb/xcb_image.h>
static const quint16 iconSize = 48;
static const qreal iconSize = 16;
#define DRAG_THRESHOLD 20
@ -237,6 +237,7 @@ void TrayWidget::wrapWindow()
return;
//create a container window
const auto ratio = devicePixelRatioF();
auto screen = xcb_setup_roots_iterator (xcb_get_setup (c)).data;
m_containerWid = xcb_generate_id(c);
uint32_t values[2];
@ -248,7 +249,7 @@ void TrayWidget::wrapWindow()
m_containerWid, /* window Id */
screen->root, /* parent window */
0, 0, /* x, y */
iconSize, iconSize, /* width, height */
iconSize * ratio, iconSize * ratio, /* width, height */
0, /* border_width */
XCB_WINDOW_CLASS_INPUT_OUTPUT,/* class */
screen->root_visual, /* visual */
@ -308,7 +309,7 @@ void TrayWidget::wrapWindow()
//use an artbitrary heuristic to make sure icons are always sensible
// if (clientGeom->width > iconSize || clientGeom->height > iconSize )
{
const uint32_t windowMoveConfigVals[2] = { iconSize, iconSize };
const uint32_t windowMoveConfigVals[2] = { uint32_t(iconSize * ratio), uint32_t(iconSize * ratio) };
xcb_configure_window(c, m_windowId,
XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT,
windowMoveConfigVals);
@ -486,6 +487,7 @@ void TrayWidget::setActive(const bool active)
void TrayWidget::refershIconImage()
{
const auto ratio = devicePixelRatioF();
auto c = QX11Info::connection();
auto cookie = xcb_get_geometry(c, m_windowId);
QScopedPointer<xcb_get_geometry_reply_t> geom(xcb_get_geometry_reply(c, cookie, Q_NULLPTR));
@ -497,8 +499,8 @@ void TrayWidget::refershIconImage()
expose.window = m_containerWid;
expose.x = 0;
expose.y = 0;
expose.width = iconSize;
expose.height = iconSize;
expose.width = iconSize * ratio;
expose.height = iconSize * ratio;
xcb_send_event_checked(c, false, m_containerWid, XCB_EVENT_MASK_VISIBILITY_CHANGE, reinterpret_cast<char *>(&expose));
xcb_flush(c);
@ -509,7 +511,6 @@ void TrayWidget::refershIconImage()
if (qimage.isNull())
return;
const auto ratio = devicePixelRatioF();
m_image = qimage.scaled(16 * ratio, 16 * ratio, Qt::KeepAspectRatio, Qt::SmoothTransformation);
m_image.setDevicePixelRatio(ratio);