[vte] widget: Move some methods to VteTerminalPrivate
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] widget: Move some methods to VteTerminalPrivate
- Date: Wed, 18 Nov 2015 20:17:20 +0000 (UTC)
commit cc4e7634a6632da7d0428b7890a6d496c9ea1523
Author: Christian Persch <chpe gnome org>
Date: Wed Nov 18 21:15:38 2015 +0100
widget: Move some methods to VteTerminalPrivate
src/vte.cc | 20 +++++++++++++-------
src/vteinternal.hh | 4 ++++
2 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index 23b1965..59bbacb 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -5408,17 +5408,23 @@ static void
vte_terminal_style_updated (GtkWidget *widget)
{
VteTerminal *terminal = VTE_TERMINAL(widget);
- float aspect;
GTK_WIDGET_CLASS (vte_terminal_parent_class)->style_updated (widget);
- vte_terminal_set_font(terminal, terminal->pvt->unscaled_font_desc);
- vte_terminal_set_padding(terminal);
+ terminal->pvt->widget_style_updated();
+}
- gtk_widget_style_get(widget, "cursor-aspect-ratio", &aspect, NULL);
- if (!_vte_double_equal(aspect, terminal->pvt->cursor_aspect_ratio)) {
- terminal->pvt->cursor_aspect_ratio = aspect;
- _vte_invalidate_cursor_once(terminal, FALSE);
+void
+VteTerminalPrivate::widget_style_updated()
+{
+ vte_terminal_set_font(m_terminal, m_unscaled_font_desc);
+ vte_terminal_set_padding(m_terminal);
+
+ float aspect;
+ gtk_widget_style_get(m_widget, "cursor-aspect-ratio", &aspect, nullptr);
+ if (!_vte_double_equal(aspect, m_cursor_aspect_ratio)) {
+ m_cursor_aspect_ratio = aspect;
+ invalidate_cursor_once();
}
}
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index e157e14..348a1e3 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -443,6 +443,8 @@ public:
void invalidate_cursor_once(bool periodic = false);
void invalidate_cursor_periodic();
+
+ void widget_style_updated();
};
#define m_invalidated_all invalidated_all
@@ -462,3 +464,5 @@ public:
#define m_cursor_blink_cycle cursor_blink_cycle
#define m_cursor_blink_timeout cursor_blink_timeout
#define m_cursor_blink_tag cursor_blink_tag
+#define m_cursor_aspect_ratio cursor_aspect_ratio
+#define m_unscaled_font_desc unscaled_font_desc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]