diff options
| author | ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com> | 2022-11-15 10:05:04 +0200 |
|---|---|---|
| committer | ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com> | 2022-11-15 10:05:04 +0200 |
| commit | ba46ff6692beb49c32260a962894c53996c32ccf (patch) | |
| tree | 4df8660508f0e93587f9d0fb221bed960f0d7b31 /launcher/ui/pages/instance | |
| parent | cca052ccc9d644c84384ceefe97bbce45381a9e2 (diff) | |
| parent | cedc7754d96e4c53d50bcce2b2a0f139b840f3d0 (diff) | |
| download | PrismLauncher-ba46ff6692beb49c32260a962894c53996c32ccf.tar.gz PrismLauncher-ba46ff6692beb49c32260a962894c53996c32ccf.tar.bz2 PrismLauncher-ba46ff6692beb49c32260a962894c53996c32ccf.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/instance-shortcuts
Diffstat (limited to 'launcher/ui/pages/instance')
| -rw-r--r-- | launcher/ui/pages/instance/ExternalResourcesPage.ui | 6 | ||||
| -rw-r--r-- | launcher/ui/pages/instance/ServersPage.cpp | 4 | ||||
| -rw-r--r-- | launcher/ui/pages/instance/VersionPage.ui | 6 |
3 files changed, 4 insertions, 12 deletions
diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.ui b/launcher/ui/pages/instance/ExternalResourcesPage.ui index 76f8ec18..33a03336 100644 --- a/launcher/ui/pages/instance/ExternalResourcesPage.ui +++ b/launcher/ui/pages/instance/ExternalResourcesPage.ui @@ -27,11 +27,7 @@ <item row="4" column="1" colspan="3"> <layout class="QGridLayout" name="gridLayout_2"> <item row="0" column="1"> - <widget class="QLineEdit" name="filterEdit"> - <property name="clearButtonEnabled"> - <bool>true</bool> - </property> - </widget> + <widget class="QLineEdit" name="filterEdit"/> </item> <item row="0" column="0"> <widget class="QLabel" name="filterLabel"> diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp index 5e8bd7cc..d64bcb76 100644 --- a/launcher/ui/pages/instance/ServersPage.cpp +++ b/launcher/ui/pages/instance/ServersPage.cpp @@ -400,11 +400,11 @@ public: virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override { - return m_servers.size(); + return parent.isValid() ? 0 : m_servers.size(); } int columnCount(const QModelIndex & parent) const override { - return COLUMN_COUNT; + return parent.isValid() ? 0 : COLUMN_COUNT; } Server * at(int index) diff --git a/launcher/ui/pages/instance/VersionPage.ui b/launcher/ui/pages/instance/VersionPage.ui index fcba5598..14b7cd9f 100644 --- a/launcher/ui/pages/instance/VersionPage.ui +++ b/launcher/ui/pages/instance/VersionPage.ui @@ -48,11 +48,7 @@ <item> <layout class="QGridLayout" name="gridLayout_2"> <item row="0" column="1"> - <widget class="QLineEdit" name="filterEdit"> - <property name="clearButtonEnabled"> - <bool>true</bool> - </property> - </widget> + <widget class="QLineEdit" name="filterEdit"/> </item> <item row="0" column="0"> <widget class="QLabel" name="filterLabel"> |