From 2d595588c1f979967a31a9c582d718fe1d9138e0 Mon Sep 17 00:00:00 2001 From: Alain Date: Thu, 6 Feb 2025 16:36:15 -0500 Subject: [PATCH 1/4] flat entry --- src/MainWindow.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index b3d3bb5f..eb45dffc 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -22,7 +22,7 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow { private static GLib.Settings settings; private Gtk.Revealer extended_revealer; - private Gtk.Entry entry; + private Gtk.Text entry; private Gtk.Button button_calc; private Gtk.Button button_history; private Gtk.Button button_ans; @@ -112,7 +112,7 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow { headerbar.add_css_class (Granite.STYLE_CLASS_DEFAULT_DECORATION); headerbar.add_css_class (Granite.STYLE_CLASS_FLAT); - entry = new Gtk.Entry () { + entry = new Gtk.Text () { xalign = 1, vexpand = true, valign = Gtk.Align.FILL From b8101091974eec3667c3930edc15e5e43c319ed6 Mon Sep 17 00:00:00 2001 From: Alain Date: Wed, 12 Feb 2025 19:15:42 -0500 Subject: [PATCH 2/4] add flat style --- data/Application.css | 4 ++++ data/io.elementary.calculator.gresource.xml | 6 ++++++ data/meson.build | 5 +++++ src/MainWindow.vala | 5 +++-- src/meson.build | 1 + 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 data/Application.css create mode 100644 data/io.elementary.calculator.gresource.xml diff --git a/data/Application.css b/data/Application.css new file mode 100644 index 00000000..6a9a7fc6 --- /dev/null +++ b/data/Application.css @@ -0,0 +1,4 @@ +entry.flat { + border: none; + box-shadow:none; +} \ No newline at end of file diff --git a/data/io.elementary.calculator.gresource.xml b/data/io.elementary.calculator.gresource.xml new file mode 100644 index 00000000..fba06652 --- /dev/null +++ b/data/io.elementary.calculator.gresource.xml @@ -0,0 +1,6 @@ + + + + Application.css + + \ No newline at end of file diff --git a/data/meson.build b/data/meson.build index bf82962e..094a36b9 100644 --- a/data/meson.build +++ b/data/meson.build @@ -35,3 +35,8 @@ i18n.merge_file( install: true, install_dir: get_option('datadir') / 'metainfo', ) + +css_gresource = gnome.compile_resources( + 'gresource_css', + 'io.elementary.calculator.gresource.xml' +) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index eb45dffc..eb888e58 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -22,7 +22,7 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow { private static GLib.Settings settings; private Gtk.Revealer extended_revealer; - private Gtk.Text entry; + private Gtk.Entry entry; private Gtk.Button button_calc; private Gtk.Button button_history; private Gtk.Button button_ans; @@ -112,12 +112,13 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow { headerbar.add_css_class (Granite.STYLE_CLASS_DEFAULT_DECORATION); headerbar.add_css_class (Granite.STYLE_CLASS_FLAT); - entry = new Gtk.Text () { + entry = new Gtk.Entry () { xalign = 1, vexpand = true, valign = Gtk.Align.FILL }; entry.add_css_class (Granite.STYLE_CLASS_H2_LABEL); + entry.add_css_class (Granite.STYLE_CLASS_FLAT); button_calc = new Button ("=") { tooltip_text = _("Calculate Result") diff --git a/src/meson.build b/src/meson.build index 0207fbaa..a174e7b2 100644 --- a/src/meson.build +++ b/src/meson.build @@ -8,6 +8,7 @@ executable( 'Core/Token.vala', 'Core/Scanner.vala', 'Core/Evaluation.vala', + css_gresource, dependencies: [ core_deps, dependency('gtk4'), From c5869e090af653f31e71654f3fc6ca2f9369d399 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Fri, 14 Feb 2025 20:51:42 +0900 Subject: [PATCH 3/4] Add EOF newline --- data/Application.css | 2 +- data/io.elementary.calculator.gresource.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/Application.css b/data/Application.css index 6a9a7fc6..bd3feeb8 100644 --- a/data/Application.css +++ b/data/Application.css @@ -1,4 +1,4 @@ entry.flat { border: none; box-shadow:none; -} \ No newline at end of file +} diff --git a/data/io.elementary.calculator.gresource.xml b/data/io.elementary.calculator.gresource.xml index fba06652..bb050eb3 100644 --- a/data/io.elementary.calculator.gresource.xml +++ b/data/io.elementary.calculator.gresource.xml @@ -3,4 +3,4 @@ Application.css - \ No newline at end of file + From 8aafddce0ba4663096b59192c3d11a2a2599e547 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Fri, 14 Feb 2025 20:52:17 +0900 Subject: [PATCH 4/4] Update data/Application.css --- data/Application.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/Application.css b/data/Application.css index bd3feeb8..10ec098c 100644 --- a/data/Application.css +++ b/data/Application.css @@ -1,4 +1,4 @@ entry.flat { border: none; - box-shadow:none; + box-shadow: none; }