diff options
| author | fiaxh <git@lightrise.org> | 2024-09-15 19:20:34 +0200 |
|---|---|---|
| committer | fiaxh <git@lightrise.org> | 2024-09-15 19:35:00 +0200 |
| commit | 13123dced135746b74f1f40148bfa9cef0c57dc0 (patch) | |
| tree | ea064994e66450857923c4bde10344134c9baf2f /main/src/ui | |
| parent | 91c8c8eb491c91f50a221cf7efe7c96a34a5de6b (diff) | |
| download | dino-13123dced135746b74f1f40148bfa9cef0c57dc0.tar.gz dino-13123dced135746b74f1f40148bfa9cef0c57dc0.zip | |
Use Adwaita 1.2, bump CI to Ubuntu 24.04
Diffstat (limited to 'main/src/ui')
| -rw-r--r-- | main/src/ui/application.vala | 8 | ||||
| -rw-r--r-- | main/src/ui/conversation_content_view/conversation_view.vala | 9 |
2 files changed, 1 insertions, 16 deletions
diff --git a/main/src/ui/application.vala b/main/src/ui/application.vala index d0fde297..9d69c10b 100644 --- a/main/src/ui/application.vala +++ b/main/src/ui/application.vala @@ -259,17 +259,11 @@ public class Dino.Ui.Application : Adw.Application, Dino.Application { case "0.4": version = @"$version - Ilulissat"; break; } } -#if Adw_1_2 + Adw.AboutWindow about_window = new Adw.AboutWindow(); about_window.application_icon = "im.dino.Dino"; about_window.application_name = "Dino"; about_window.issue_url = "https://github.com/dino/dino/issues"; -#else - Gtk.AboutDialog about_window = new Gtk.AboutDialog(); - about_window.logo_icon_name = "im.dino.Dino"; - about_window.program_name = "Dino"; - about_window.website_label = "dino.im"; -#endif about_window.destroy_with_parent = true; about_window.transient_for = window; about_window.modal = true; diff --git a/main/src/ui/conversation_content_view/conversation_view.vala b/main/src/ui/conversation_content_view/conversation_view.vala index 519aa01f..27472585 100644 --- a/main/src/ui/conversation_content_view/conversation_view.vala +++ b/main/src/ui/conversation_content_view/conversation_view.vala @@ -301,18 +301,9 @@ public class ConversationView : Widget, Plugins.ConversationItemCollection, Plug } private Adw.Animation scroll_animation(double target) { -#if ADW_1_2 return new Adw.TimedAnimation(scrolled, scrolled.vadjustment.value, target, 500, new Adw.PropertyAnimationTarget(scrolled.vadjustment, "value") ); -#else - return new Adw.TimedAnimation(scrolled, scrolled.vadjustment.value, target, 500, - new Adw.CallbackAnimationTarget(value => { - scrolled.vadjustment.value = value; - }) - ); -#endif - } public void initialize_around_message(Conversation conversation, ContentItem content_item) { |