[vte/vte-0-62] Revert "widget: Implement GtkScrollableInterface::get_border"
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte/vte-0-62] Revert "widget: Implement GtkScrollableInterface::get_border"
- Date: Wed, 3 Mar 2021 21:12:35 +0000 (UTC)
commit d9e3e449ff15be06c7af8143927aee4445ba6ddd
Author: Christian Persch <chpe src gnome org>
Date: Wed Mar 3 22:12:27 2021 +0100
Revert "widget: Implement GtkScrollableInterface::get_border"
This reverts commit 62c4908953e3fea8e0771fa82212462157d46d4f.
src/vtegtk.cc | 26 ++------------------------
src/vteinternal.hh | 1 -
src/widget.hh | 1 -
3 files changed, 2 insertions(+), 26 deletions(-)
---
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 41de14ba..1cdee6b8 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -79,8 +79,6 @@ struct _VteTerminalClassPrivate {
GtkStyleProvider *style_provider;
};
-static void vte_terminal_scrollable_iface_init(GtkScrollableInterface* iface) noexcept;
-
#ifdef VTE_DEBUG
G_DEFINE_TYPE_WITH_CODE(VteTerminal, vte_terminal, GTK_TYPE_WIDGET,
{
@@ -88,7 +86,7 @@ G_DEFINE_TYPE_WITH_CODE(VteTerminal, vte_terminal, GTK_TYPE_WIDGET,
g_type_add_instance_private(g_define_type_id,
sizeof(vte::platform::Widget));
}
g_type_add_class_private (g_define_type_id, sizeof (VteTerminalClassPrivate));
- G_IMPLEMENT_INTERFACE(GTK_TYPE_SCROLLABLE, vte_terminal_scrollable_iface_init)
+ G_IMPLEMENT_INTERFACE(GTK_TYPE_SCROLLABLE, NULL)
if (_vte_debug_on(VTE_DEBUG_LIFECYCLE)) {
g_printerr("vte_terminal_get_type()\n");
})
@@ -99,7 +97,7 @@ G_DEFINE_TYPE_WITH_CODE(VteTerminal, vte_terminal, GTK_TYPE_WIDGET,
g_type_add_instance_private(g_define_type_id,
sizeof(vte::platform::Widget));
}
g_type_add_class_private (g_define_type_id, sizeof (VteTerminalClassPrivate));
- G_IMPLEMENT_INTERFACE(GTK_TYPE_SCROLLABLE, vte_terminal_scrollable_iface_init))
+ G_IMPLEMENT_INTERFACE(GTK_TYPE_SCROLLABLE, NULL))
#endif
static inline
@@ -2041,26 +2039,6 @@ vte_terminal_class_init(VteTerminalClass *klass)
#endif
}
-static gboolean
-vte_terminal_scrollable_get_border(GtkScrollable* scrollable,
- GtkBorder* border) noexcept
-try
-{
- *border = *WIDGET(VTE_TERMINAL(scrollable))->padding();
- return true;
-}
-catch (...)
-{
- vte::log_exception();
- return false;
-}
-
-static void
-vte_terminal_scrollable_iface_init(GtkScrollableInterface* iface) noexcept
-{
- iface->get_border = vte_terminal_scrollable_get_border;
-}
-
/* public API */
/**
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 333f858c..bc75888e 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -958,7 +958,6 @@ public:
/* Style stuff */
GtkBorder m_padding{1, 1, 1, 1};
- auto padding() const noexcept { return &m_padding; }
vte::glib::RefPtr<GtkAdjustment> m_vadjustment{};
auto vadjustment() noexcept { return m_vadjustment.get(); }
diff --git a/src/widget.hh b/src/widget.hh
index 3f7f8e36..0025d5bb 100644
--- a/src/widget.hh
+++ b/src/widget.hh
@@ -108,7 +108,6 @@ public:
void set_vscroll_policy(GtkScrollablePolicy policy) noexcept { m_vscroll_policy = policy; }
auto hscroll_policy() const noexcept { return m_hscroll_policy; }
auto vscroll_policy() const noexcept { return m_vscroll_policy; }
- auto padding() const noexcept { return terminal()->padding(); }
bool set_cursor_blink_mode(VteCursorBlinkMode mode) { return
terminal()->set_cursor_blink_mode(vte::terminal::Terminal::CursorBlinkMode(mode)); }
auto cursor_blink_mode() const noexcept { return
VteCursorBlinkMode(terminal()->cursor_blink_mode()); }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]