[gnome-calendar/gbsneto/gtk4: 22/46] event-editor/notes-section: Port to GTK4
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar/gbsneto/gtk4: 22/46] event-editor/notes-section: Port to GTK4
- Date: Sat, 12 Feb 2022 16:25:50 +0000 (UTC)
commit d32be4527362999edaef8dd65da3abf956893efe
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Fri Jan 14 11:25:15 2022 -0300
event-editor/notes-section: Port to GTK4
src/gui/event-editor/gcal-notes-section.c | 6 ++++--
src/gui/event-editor/gcal-notes-section.h | 4 ++--
src/gui/event-editor/gcal-notes-section.ui | 11 ++---------
src/theme/Adwaita.css | 10 ++--------
4 files changed, 10 insertions(+), 21 deletions(-)
---
diff --git a/src/gui/event-editor/gcal-notes-section.c b/src/gui/event-editor/gcal-notes-section.c
index 52314a6c..eeb105ed 100644
--- a/src/gui/event-editor/gcal-notes-section.c
+++ b/src/gui/event-editor/gcal-notes-section.c
@@ -27,7 +27,7 @@
struct _GcalNotesSection
{
- GtkBin parent;
+ AdwBin parent;
GtkTextView *notes_text;
@@ -37,7 +37,7 @@ struct _GcalNotesSection
static void gcal_event_editor_section_iface_init (GcalEventEditorSectionInterface *iface);
-G_DEFINE_TYPE_WITH_CODE (GcalNotesSection, gcal_notes_section, GTK_TYPE_BIN,
+G_DEFINE_TYPE_WITH_CODE (GcalNotesSection, gcal_notes_section, ADW_TYPE_BIN,
G_IMPLEMENT_INTERFACE (GCAL_TYPE_EVENT_EDITOR_SECTION,
gcal_event_editor_section_iface_init))
enum
@@ -177,4 +177,6 @@ static void
gcal_notes_section_init (GcalNotesSection *self)
{
gtk_widget_init_template (GTK_WIDGET (self));
+
+ gtk_widget_remove_css_class (GTK_WIDGET (self->notes_text), "view");
}
diff --git a/src/gui/event-editor/gcal-notes-section.h b/src/gui/event-editor/gcal-notes-section.h
index f9b4dab1..ccf93e3e 100644
--- a/src/gui/event-editor/gcal-notes-section.h
+++ b/src/gui/event-editor/gcal-notes-section.h
@@ -20,11 +20,11 @@
#pragma once
-#include <gtk/gtk.h>
+#include <adwaita.h>
G_BEGIN_DECLS
#define GCAL_TYPE_NOTES_SECTION (gcal_notes_section_get_type())
-G_DECLARE_FINAL_TYPE (GcalNotesSection, gcal_notes_section, GCAL, NOTES_SECTION, GtkBin)
+G_DECLARE_FINAL_TYPE (GcalNotesSection, gcal_notes_section, GCAL, NOTES_SECTION, AdwBin)
G_END_DECLS
diff --git a/src/gui/event-editor/gcal-notes-section.ui b/src/gui/event-editor/gcal-notes-section.ui
index 4b19336f..acbf6872 100644
--- a/src/gui/event-editor/gcal-notes-section.ui
+++ b/src/gui/event-editor/gcal-notes-section.ui
@@ -1,23 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <template class="GcalNotesSection" parent="GtkBin">
- <property name="can_focus">False</property>
+ <template class="GcalNotesSection" parent="AdwBin">
<style>
<class name="notes-section" />
+ <class name="card" />
</style>
-
<child>
<object class="GtkBox">
- <property name="visible">True</property>
- <style>
- <class name="frame" />
- </style>
<child>
<object class="GtkTextView" id="notes_text">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="top_margin">6</property>
<property name="bottom_margin">6</property>
diff --git a/src/theme/Adwaita.css b/src/theme/Adwaita.css
index a572f1ea..9b3826da 100644
--- a/src/theme/Adwaita.css
+++ b/src/theme/Adwaita.css
@@ -499,17 +499,11 @@ monthpopover > box {
background: @theme_bg_color;
}
-.notes-section .frame {
- border-radius: 8px;
- -gtk-outline-radius: 7px;
- border-color: alpha(@borders, 0.7);
-}
-
-.notes-section .frame > textview.view {
+.notes-section box > textview {
border-radius: 8px;
padding: 8px;
}
-.notes-section .frame > textview.view > text {
+.notes-section box > textview > text {
background: none;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]