aboutsummaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorSaptak S <saptak013@gmail.com>2021-01-18 00:50:59 +0530
committerSaptak S <saptak013@gmail.com>2021-01-18 00:51:15 +0530
commitd8a0e7dbffa3d168aac32c45a011ac1798c8de7c (patch)
treecaeb519f4ddc8902b862af1cda3963a1bd2a9c0b /desktop
parent6eee7f9c5c42752bb17a1ae2da14a96a55ba7297 (diff)
downloadonionshare-d8a0e7dbffa3d168aac32c45a011ac1798c8de7c.tar.gz
onionshare-d8a0e7dbffa3d168aac32c45a011ac1798c8de7c.zip
Fixes macOS layout while maintaining similar layout in linux
In macOS, in share and website mode, the text gets cut off unless it is full screen. This is mostly because of margin being applied by css. Here I have tried to implement a similar layout using qt instead of CSS so it behaves reasonably everywhere.
Diffstat (limited to 'desktop')
-rw-r--r--desktop/src/onionshare/gui_common.py2
-rw-r--r--desktop/src/onionshare/tab/mode/file_selection.py4
2 files changed, 2 insertions, 4 deletions
diff --git a/desktop/src/onionshare/gui_common.py b/desktop/src/onionshare/gui_common.py
index 7d367b99..4bf68bf8 100644
--- a/desktop/src/onionshare/gui_common.py
+++ b/desktop/src/onionshare/gui_common.py
@@ -292,12 +292,10 @@ class GuiCommon:
QLabel {
color: #4E064F;
font-size: 48px;
- margin-bottom: 72px;
}""",
"share_file_selection_drop_here_label": """
QLabel {
color: #666666;
- margin-bottom: 48px;
}""",
"share_file_selection_drop_count_label": """
QLabel {
diff --git a/desktop/src/onionshare/tab/mode/file_selection.py b/desktop/src/onionshare/tab/mode/file_selection.py
index 54d9ea83..fed4e4c5 100644
--- a/desktop/src/onionshare/tab/mode/file_selection.py
+++ b/desktop/src/onionshare/tab/mode/file_selection.py
@@ -72,8 +72,8 @@ class DropHereWidget(QtWidgets.QWidget):
def resize(self, w, h):
self.setGeometry(0, 0, w, h)
self.image_label.setGeometry(0, 0, w, h - 100)
- self.header_label.setGeometry(0, 340, w, h - 340)
- self.text_label.setGeometry(0, 410, w, h - 410)
+ self.header_label.setGeometry(0, 310, w, h - 380)
+ self.text_label.setGeometry(0, 360, w, h - 400)
class DropCountLabel(QtWidgets.QLabel):