vv/fractal
1
0
Fork 0
Code Pull requests Projects Releases Packages Activity

misc: Do not change line height

Browse source 
It makes the text blurry on non-HiDPI screens.
This change is temporary for the Fractal 5 release.
This commit is contained in:
Kévin Commaille 2023-11-21 10:34:17 +01:00
parent d6d2c43c71
commit 9d0409124c
No known key found for this signature in database
GPG key ID: 29A48C1F03620416
8 changed files with 0 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/resources/style.css
View file

@ -9,10 +9,6 @@ textview, text {
font-weight: bold; font-weight: bold;
} }
.line-height {
line-height: 150%;
}
button.pill.large { button.pill.large {
padding: 12px 40px; padding: 12px 40px;
} }
@ -48,11 +44,6 @@ button.opaque.success {
color: @error_bg_color; color: @error_bg_color;
} }
preferencesgroup .body,
.large-line-height {
line-height: 140%;
}
button.row { button.row {
min-height: 34px; min-height: 34px;
border-radius: 12px; border-radius: 12px;

1
src/components/label_with_widgets.rs
View file

@ -83,7 +83,6 @@ mod imp {
label.set_wrap_mode(pango::WrapMode::WordChar); label.set_wrap_mode(pango::WrapMode::WordChar);
label.set_xalign(0.0); label.set_xalign(0.0);
label.set_valign(gtk::Align::Start); label.set_valign(gtk::Align::Start);
label.add_css_class("line-height");
} }
fn dispose(&self) { fn dispose(&self) {

21
src/error_page.ui
View file

@ -30,9 +30,6 @@
<property name="spacing">24</property> <property name="spacing">24</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="wrap">true</property> <property name="wrap">true</property>
<property name="wrap-mode">word-char</property> <property name="wrap-mode">word-char</property>
<property name="xalign">0.0</property> <property name="xalign">0.0</property>
@ -45,9 +42,6 @@
<property name="spacing">12</property> <property name="spacing">12</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="wrap">true</property> <property name="wrap">true</property>
<property name="wrap-mode">word-char</property> <property name="wrap-mode">word-char</property>
<property name="xalign">0.0</property> <property name="xalign">0.0</property>
@ -59,18 +53,12 @@
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="valign">start</property> <property name="valign">start</property>
<property name="label">•</property> <property name="label">•</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="wrap">true</property> <property name="wrap">true</property>
<property name="wrap-mode">word-char</property> <property name="wrap-mode">word-char</property>
<property name="xalign">0.0</property> <property name="xalign">0.0</property>
@ -84,18 +72,12 @@
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="valign">start</property> <property name="valign">start</property>
<property name="label">•</property> <property name="label">•</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="wrap">true</property> <property name="wrap">true</property>
<property name="wrap-mode">word-char</property> <property name="wrap-mode">word-char</property>
<property name="xalign">0.0</property> <property name="xalign">0.0</property>
@ -108,9 +90,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="wrap">true</property> <property name="wrap">true</property>
<property name="wrap-mode">word-char</property> <property name="wrap-mode">word-char</property>
<property name="xalign">0.0</property> <property name="xalign">0.0</property>

6
src/session/view/account_settings/security_page/import_export_keys_subpage.ui
View file

@ -28,9 +28,6 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkLabel" id="description"> <object class="GtkLabel" id="description">
<style>
<class name="large-line-height"/>
</style>
<property name="label"></property> <property name="label"></property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="wrap-mode">word-char</property> <property name="wrap-mode">word-char</property>
@ -39,9 +36,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="instructions"> <object class="GtkLabel" id="instructions">
<style>
<class name="large-line-height"/>
</style>
<property name="label"></property> <property name="label"></property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="wrap-mode">word-char</property> <property name="wrap-mode">word-char</property>

6
src/session/view/account_settings/user_page/change_password_subpage.ui
View file

@ -38,9 +38,6 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="label" translatable="yes">Changing your password will log you out of your other sessions.</property> <property name="label" translatable="yes">Changing your password will log you out of your other sessions.</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="wrap-mode">word-char</property> <property name="wrap-mode">word-char</property>
@ -49,9 +46,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="label" translatable="yes">Fractal’s support for encryption is unstable so you might lose access to your encrypted message history. It is recommended to backup your encryption keys before proceeding.</property> <property name="label" translatable="yes">Fractal’s support for encryption is unstable so you might lose access to your encrypted message history. It is recommended to backup your encryption keys before proceeding.</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="wrap-mode">word-char</property> <property name="wrap-mode">word-char</property>

6
src/session/view/account_settings/user_page/deactivate_account_subpage.ui
View file

@ -38,9 +38,6 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="label" translatable="yes">Deactivating your account means you will lose access to all your messages, contacts, files, and more, forever.</property> <property name="label" translatable="yes">Deactivating your account means you will lose access to all your messages, contacts, files, and more, forever.</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="wrap-mode">word-char</property> <property name="wrap-mode">word-char</property>
@ -49,9 +46,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="label" translatable="yes">To confirm that you really want to deactivate this account, type in your Matrix user ID:</property> <property name="label" translatable="yes">To confirm that you really want to deactivate this account, type in your Matrix user ID:</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="wrap-mode">word-char</property> <property name="wrap-mode">word-char</property>

6
src/session/view/account_settings/user_page/log_out_subpage.ui
View file

@ -38,9 +38,6 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="label" translatable="yes">Fractal doesn’t support online backup of room encryption keys so you might lose access to your encrypted message history.</property> <property name="label" translatable="yes">Fractal doesn’t support online backup of room encryption keys so you might lose access to your encrypted message history.</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="wrap-mode">word-char</property> <property name="wrap-mode">word-char</property>
@ -49,9 +46,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="label" translatable="yes">It is recommended to backup your encryption keys before proceeding.</property> <property name="label" translatable="yes">It is recommended to backup your encryption keys before proceeding.</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="wrap-mode">word-char</property> <property name="wrap-mode">word-char</property>

1
src/session/view/content/room_history/message_row/text.rs
View file

@ -532,7 +532,6 @@ fn new_label() -> gtk::Label {
.wrap_mode(pango::WrapMode::WordChar) .wrap_mode(pango::WrapMode::WordChar)
.xalign(0.0) .xalign(0.0)
.valign(gtk::Align::Start) .valign(gtk::Align::Start)
.css_classes(["line-height"])
.build() .build()
} }