File 0001-Gtk-Add-support-for-GtkSourceView-4-API.patch of Package gimagereader

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Gtk-Add-support-for-GtkSourceView-4-API.patch of Package gimagereader

From 6fcb126af351fd374a9060b6f7c36bef72f51477 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Mon, 6 Jan 2020 10:55:11 +0100
Subject: [PATCH] [Gtk] Add support for GtkSourceView 4 API

---
 CMakeLists.txt              | 5 ++++-
 gtk/src/OutputEditorText.cc | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc7c04b..bede16e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,7 +94,10 @@ INCLUDE_DIRECTORIES(
 
 IF("${INTERFACE_TYPE}" STREQUAL "gtk")
     PKG_CHECK_MODULES(GTKMM REQUIRED gtkmm-3.0)
-    PKG_CHECK_MODULES(GTKSOURCEVIEWMM REQUIRED gtksourceviewmm-3.0)
+    PKG_CHECK_MODULES(GTKSOURCEVIEWMM gtksourceviewmm-4.0)
+    IF(NOT GTKSOURCEVIEWMM_FOUND)
+      PKG_CHECK_MODULES(GTKSOURCEVIEWMM REQUIRED gtksourceviewmm-3.0)
+    ENDIF(NOT GTKSOURCEVIEWMM_FOUND)
     PKG_CHECK_MODULES(GTKSPELLMM REQUIRED gtkspellmm-3.0>=3.0.5)
     PKG_CHECK_MODULES(CAIROMM REQUIRED cairomm-1.0)
     PKG_CHECK_MODULES(PANGOMM REQUIRED pangomm-1.4)
diff --git a/gtk/src/OutputEditorText.cc b/gtk/src/OutputEditorText.cc
index c7d8639..9803f89 100644
--- a/gtk/src/OutputEditorText.cc
+++ b/gtk/src/OutputEditorText.cc
@@ -72,9 +72,17 @@ OutputEditorText::OutputEditorText() {
 	CONNECT(ui.textview, populate_popup, [this](Gtk::Menu * menu) {
 		completeTextViewMenu(menu);
 	});
+#if GTK_SOURCE_MAJOR_VERSION >= 4
+	CONNECT(ui.menuitemStripcrlfDrawwhitespace, toggled, [this] {
+		GtkSourceSpaceDrawer* space_drawer = gtk_source_view_get_space_drawer(ui.textview->gobj());
+		gtk_source_space_drawer_set_types_for_locations (space_drawer, GTK_SOURCE_SPACE_LOCATION_ALL, GTK_SOURCE_SPACE_TYPE_ALL);
+		gtk_source_space_drawer_set_enable_matrix (space_drawer, ui.menuitemStripcrlfDrawwhitespace->get_active() ? TRUE : FALSE);
+	});
+#else
 	CONNECT(ui.menuitemStripcrlfDrawwhitespace, toggled, [this] {
 		ui.textview->set_draw_spaces(ui.menuitemStripcrlfDrawwhitespace->get_active() ? (Gsv::DRAW_SPACES_NEWLINE | Gsv::DRAW_SPACES_TAB | Gsv::DRAW_SPACES_SPACE) : Gsv::DrawSpacesFlags(0));
 	});
+#endif
 
 	// If the insert or selection mark change save the bounds either if the view is focused or the selection is non-empty
 	CONNECTP(m_textBuffer, cursor_position, [this] { m_textBuffer->save_region_bounds(ui.textview->is_focus()); });
-- 
2.24.1

Places

File 0001-Gtk-Add-support-for-GtkSourceView-4-API.patch of Package gimagereader

Places