Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Qt: minor fixes #4353

Merged
merged 2 commits into from
Mar 28, 2018
Merged

Qt: minor fixes #4353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfc3a7d
Qt: minor fixes
Megamouse Mar 28, 2018
399885b
Merge branch 'master' into master
AniLeo Mar 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions rpcs3/rpcs3qt/game_list_frame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> guiSettings, std:
m_gameList->verticalScrollBar()->setSingleStep(20);
m_gameList->horizontalScrollBar()->setSingleStep(20);
m_gameList->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
m_gameList->verticalHeader()->setMinimumSectionSize(m_Icon_Size.height());
m_gameList->verticalHeader()->setMaximumSectionSize(m_Icon_Size.height());
m_gameList->verticalHeader()->setVisible(false);
m_gameList->horizontalHeader()->setContextMenuPolicy(Qt::CustomContextMenu);
m_gameList->horizontalHeader()->setHighlightSections(false);
Expand Down
4 changes: 2 additions & 2 deletions rpcs3/rpcs3qt/game_list_frame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,11 +263,11 @@ private Q_SLOTS:
QString m_search_text;

// Icon Size
int m_icon_size_index;
int m_icon_size_index = 0;

// Icons
QColor m_Icon_Color;
QSize m_Icon_Size;
QSize m_Icon_Size = gui::gl_icon_size_min; // ensure a valid size
qreal m_Margin_Factor;
qreal m_Text_Factor;
};
4 changes: 2 additions & 2 deletions rpcs3/rpcs3qt/main_window.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ class main_window : public QMainWindow
Ui::main_window *ui;

bool m_sys_menu_opened;
bool m_is_list_mode = false;
bool m_is_list_mode = true;
bool m_save_slider_pos = false;
int m_other_slider_pos;
int m_other_slider_pos = 0;

QIcon m_appIcon;
QIcon m_icon_play;
Expand Down
10 changes: 5 additions & 5 deletions rpcs3/rpcs3qt/settings_dialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
<attribute name="title">
<string>CPU</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_55">
<layout class="QVBoxLayout" name="coreTabLayout" stretch="1,0,0">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,1,2">
<layout class="QHBoxLayout" name="coreTabItemLayout" stretch="1,1,2">
<item>
<layout class="QVBoxLayout" name="verticalLayout_8" stretch="1,1,1">
<layout class="QVBoxLayout" name="coreTabLeftLayout" stretch="1,1,0">
<item>
<widget class="QGroupBox" name="ppu">
<property name="title">
Expand Down Expand Up @@ -132,7 +132,7 @@
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_10" stretch="1,1">
<layout class="QVBoxLayout" name="coreTabMiddleLayout" stretch="1,1">
<item>
<widget class="QGroupBox" name="lib_settings">
<property name="sizePolicy">
Expand Down Expand Up @@ -240,7 +240,7 @@
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_9" stretch="1,0">
<layout class="QVBoxLayout" name="coreTabRightLayout" stretch="1,0">
<item>
<widget class="QGroupBox" name="groupBox_28">
<property name="sizePolicy">
Expand Down