openkylin
/
ukui-touch-settings-plugin
mirror of https://gitee.com/openkylin/ukui-touch-settings-plugin.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'upstream' into 'upstream' 

Upstream修改触控板大小尺寸问题

See merge request kylinos-src/ukui-touch-settings-plugin!2
This commit is contained in:
王伟男 2022-09-26 06:46:59 +00:00
parent 9f3421b33b 101c7fdd96
commit 1cbd4abd7a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
touchpad-settings/touchpadsettingsui.cpp
View File

@ -268,18 +268,18 @@ void TouchpadUI::initUI()
vLayout_1->addWidget(horizenFourSwipe);
}
gestureLayout->addWidget(gestureItem);
gestureLayout->addSpacing(28);
gestureLayout->addSpacing(24);
// Gif 播放部分
QWidget *videoWidget = new QWidget(gestureFrame);
QLabel *video_label = new QLabel(videoWidget);
video_label->setFixedSize(400, 400);
video_label->setFixedSize(356, 400);
QVBoxLayout *videoLayout = new QVBoxLayout(videoWidget);
videoLayout->setContentsMargins(0, 0, 0, 0);
videoLayout->addWidget(video_label);
m_movie = new QMovie(gestureFrame);
m_movie->setFileName(":/gif/resources/"+projectCodeName+"三指轻点.gif");
m_movie->setScaledSize(QSize(384, 400));
m_movie->setScaledSize(QSize(356, 400));
m_movie->start();
m_movie->stop();
video_label->setMovie(m_movie);

8
touchscreen-settings/gesture-widget/gesturewidget.cpp
View File

@ -15,8 +15,8 @@ const QString iconName = "video-x-generic-symbolic";
gestureWidget::gestureWidget(QWidget *parent) : QPushButton(parent)
{
setFocusPolicy(Qt::FocusPolicy::ClickFocus);
setMinimumWidth(100);
setFixedHeight(64);
setMinimumWidth(196);
setFixedHeight(60);
setCheckable(true);
setAutoExclusive(true);
setProperty("useButtonPalette", true);
@ -28,7 +28,7 @@ gestureWidget::gestureWidget(QWidget *parent) : QPushButton(parent)
);
QVBoxLayout *vlayout = new QVBoxLayout(this);
vlayout->setContentsMargins(16, 10, 0, 7);
vlayout->setContentsMargins(16, 10, 16, 7);
vlayout->setSpacing(0);
m_action = new QLabel(this);
m_action->setScaledContents(true);
@ -46,7 +46,7 @@ gestureWidget::gestureWidget(QWidget *parent) : QPushButton(parent)
}
QHBoxLayout *hlayout = new QHBoxLayout;
hlayout->setContentsMargins(0, 0, 0, 0);
hlayout->setSpacing(6);
hlayout->setSpacing(8);
hlayout->addWidget(m_action, 0, Qt::AlignVCenter);
hlayout->addWidget(m_playIcon, 0, Qt::AlignVCenter);
hlayout->addStretch();