From 52956954e5eed1c3c31846bb34e6e09b839df52a Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Sun, 15 Dec 2019 14:56:40 -0400
Subject: [PATCH] Fix filter field overflowing at some sizes/zooms

---
 TODO.md                              | 14 ++++++++------
 src/qml/Chat/RoomPane/MemberView.qml |  2 +-
 src/qml/MainPane/MainPaneToolBar.qml |  5 +++++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/TODO.md b/TODO.md
index 34a0eb11..c3e84581 100644
--- a/TODO.md
+++ b/TODO.md
@@ -45,20 +45,22 @@
 
 - Room Sidepane save/load size & keybinds
 
-## Bug fixes
+## Issues
 
-- invisible image
+- invisible uploaded mxc images?
 - first undecryptable message
-- two upload delegates height bug
-- Leave box button focus
-- Pause upload, switch to other room, then come back, wrong state displayed
 - Adding an account with no rooms
 - Join button 502
 - Retry the initial profile retrieval if it fails (due to e.g. dead server)
+- Leave box button focus
 
+- two upload delegates height bug
 - Messed up message delegates position
-- Pausing uploads doesn't work well, servers end up dropping the connection 
 - Quickly posting with another account leads to sync stop
+
+- Pausing uploads doesn't work well, servers end up dropping the connection 
+- Pause upload, switch to other room, then come back, wrong state displayed
+
 - `code` not colored in room subtitle
 - In the "Leave me" room, "join > Hi > left" aren't combined
 - Event delegates changing height don't scroll the list
diff --git a/src/qml/Chat/RoomPane/MemberView.qml b/src/qml/Chat/RoomPane/MemberView.qml
index 6a450031..c4d3691f 100644
--- a/src/qml/Chat/RoomPane/MemberView.qml
+++ b/src/qml/Chat/RoomPane/MemberView.qml
@@ -53,7 +53,7 @@ HColumnLayout {
             placeholderText: qsTr("Filter members")
             backgroundColor: theme.chat.roomPane.filterMembers.background
             bordered: false
-            opacity: width >= 16 ? 1 : 0
+            opacity: width >= 16 * theme.uiScale ? 1 : 0
 
             onTextChanged: filterLimiter.restart()
 
diff --git a/src/qml/MainPane/MainPaneToolBar.qml b/src/qml/MainPane/MainPaneToolBar.qml
index 61cbfdfb..226ab910 100644
--- a/src/qml/MainPane/MainPaneToolBar.qml
+++ b/src/qml/MainPane/MainPaneToolBar.qml
@@ -4,6 +4,8 @@ import "../Base"
 
 HRowLayout {
     id: toolBar
+    // Hide filter field overflowing for a sec on size changes
+    clip: true
 
     property AccountRoomList mainPaneList
     readonly property alias addAccountButton: addAccountButton
@@ -27,6 +29,7 @@ HRowLayout {
         placeholderText: qsTr("Filter rooms")
         backgroundColor: theme.mainPane.filterRooms.background
         bordered: false
+        opacity: width >= 16 * theme.uiScale ? 1 : 0
 
         Layout.fillWidth: true
         Layout.fillHeight: true
@@ -49,5 +52,7 @@ HRowLayout {
             if (window.settings.clearRoomFilterOnEscape) text = ""
             mainUI.pageLoader.forceActiveFocus()
         }
+
+        Behavior on opacity { HOpacityAnimator {} }
     }
 }