ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: fix pad settings resize when switching tabs

This commit is contained in:
Megamouse 2020-07-08 23:47:45 +02:00
parent a3e79fc105
commit 0756fd9c7e
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View File

@ -207,17 +207,22 @@ pad_settings_dialog::pad_settings_dialog(QWidget *parent, const GameInfo *game)
// Initialize configurable buttons // Initialize configurable buttons
InitButtons(); InitButtons();
// Set up first tab // Repaint controller image
OnTabChanged(0);
// repaint controller image
ui->l_controller->setPixmap(gui::utils::get_colorized_pixmap(*ui->l_controller->pixmap(), QColor(), gui::utils::get_label_color("l_controller"), false, true)); ui->l_controller->setPixmap(gui::utils::get_colorized_pixmap(*ui->l_controller->pixmap(), QColor(), gui::utils::get_label_color("l_controller"), false, true));
show(); // Show default widgets first in order to calculate the required size for the scroll area (see pad_settings_dialog::ResizeDialog)
ui->left_stack->setCurrentIndex(0);
ui->right_stack->setCurrentIndex(0);
RepaintPreviewLabel(ui->preview_stick_left, ui->slider_stick_left->value(), ui->slider_stick_left->size().width(), 0, 0, 0); RepaintPreviewLabel(ui->preview_stick_left, ui->slider_stick_left->value(), ui->slider_stick_left->size().width(), 0, 0, 0);
RepaintPreviewLabel(ui->preview_stick_right, ui->slider_stick_right->value(), ui->slider_stick_right->size().width(), 0, 0, 0); RepaintPreviewLabel(ui->preview_stick_right, ui->slider_stick_right->value(), ui->slider_stick_right->size().width(), 0, 0, 0);
show();
// Set up first tab
OnTabChanged(0);
// Resize in order to fit into our scroll area
ResizeDialog(); ResizeDialog();
} }
@ -589,7 +594,7 @@ void pad_settings_dialog::ReactivateButtons()
void pad_settings_dialog::RepaintPreviewLabel(QLabel* l, int deadzone, int desired_width, int x, int y, double multiplier) void pad_settings_dialog::RepaintPreviewLabel(QLabel* l, int deadzone, int desired_width, int x, int y, double multiplier)
{ {
const int deadzone_max = m_handler->thumb_max; const int deadzone_max = m_handler ? m_handler->thumb_max : 255; // 255 used as fallback. The deadzone circle shall be small.
const qreal device_pixel_ratio = devicePixelRatioF(); const qreal device_pixel_ratio = devicePixelRatioF();
const qreal scaled_width = desired_width * device_pixel_ratio; const qreal scaled_width = desired_width * device_pixel_ratio;
const qreal origin = desired_width / 2.0; const qreal origin = desired_width / 2.0;
@ -694,7 +699,8 @@ void pad_settings_dialog::wheelEvent(QWheelEvent *event)
return; return;
} }
QPoint direction = event->angleDelta(); const QPoint direction = event->angleDelta();
if (direction.isNull()) if (direction.isNull())
{ {
// Scrolling started/ended event, no direction given // Scrolling started/ended event, no direction given
@ -702,10 +708,10 @@ void pad_settings_dialog::wheelEvent(QWheelEvent *event)
} }
u32 key; u32 key;
if (const int x = direction.x()) if (const int x = direction.x())
{ {
bool to_left = event->inverted() ? x < 0 : x > 0; if (event->inverted() ? x < 0 : x > 0)
if (to_left)
{ {
key = mouse::wheel_left; key = mouse::wheel_left;
} }
@ -717,8 +723,8 @@ void pad_settings_dialog::wheelEvent(QWheelEvent *event)
else else
{ {
const int y = direction.y(); const int y = direction.y();
bool to_up = event->inverted() ? y < 0 : y > 0;
if (to_up) if (event->inverted() ? y < 0 : y > 0)
{ {
key = mouse::wheel_up; key = mouse::wheel_up;
} }

4
rpcs3/rpcs3qt/pad_settings_dialog.ui
View File

@ -647,7 +647,7 @@
<number>0</number> <number>0</number>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="pad_page"> <widget class="QWidget" name="pad_page">
<layout class="QVBoxLayout" name="pad_page_layout"> <layout class="QVBoxLayout" name="pad_page_layout">
@ -2065,7 +2065,7 @@
<item> <item>
<widget class="QStackedWidget" name="right_stack"> <widget class="QStackedWidget" name="right_stack">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="stick_page"> <widget class="QWidget" name="stick_page">
<layout class="QVBoxLayout" name="stick_page_layout"> <layout class="QVBoxLayout" name="stick_page_layout">