/*
* This file is a part of hildon
*
- * Copyright (C) 2008 Nokia Corporation, all rights reserved.
+ * Copyright (C) 2008, 2009 Nokia Corporation, all rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser Public License as published by
/**
* SECTION:hildon-text-view
- * @short_description: Widget representing a text view in the Hildon framework.
+ * @short_description: Text view within the Hildon framework.
*
- * The #HildonTextView is a GTK widget which represents a text
- * view. It is derived from the #GtkTextView widget and provides
- * additional commodities specific to the Hildon framework.
+ * #HildonTextView is a text view derived from the #GtkTextView widget
+ * but with a slightly different appearance designed for the Hildon
+ * 2.2 framework.
*
- * Besides all the features inherited from #GtkTextView, a
- * #HildonTextView can also have a placeholder text. This text will be
+ * Text views in Hildon 2.2 can have a placeholder text, set with
+ * hildon_gtk_text_view_set_placeholder_text(). This text will be
* shown if the text view is empty and doesn't have the input focus,
* but it's otherwise ignored. Thus, calls to
- * hildon_text_view_get_buffer() will never return the placeholder
- * text, not even when it's being displayed.
- *
- * Although #HildonTextView is derived from #GtkTextView,
- * gtk_text_view_get_buffer() and gtk_text_view_set_buffer() must
- * never be used to get/set the buffer in this
- * widget. hildon_text_view_get_buffer() and
- * hildon_text_view_set_buffer() must be used instead.
+ * gtk_text_view_get_buffer() will never return the placeholder text,
+ * not even when it's being displayed.
*
* <example>
* <title>Creating a HildonTextView with a placeholder</title>
* GtkWidget *text_view;
* <!-- -->
* text_view = hildon_text_view_new ();
- * hildon_text_view_set_placeholder (HILDON_TEXT_VIEW (text_view),
- * "Type some text here");
+ * hildon_gtk_text_view_set_placeholder_text (GTK_TEXT_VIEW (text_view),
+ * "Type some text here");
* <!-- -->
* return text_view;
* }
* </example>
*/
+#undef HILDON_DISABLE_DEPRECATED
+
#include "hildon-text-view.h"
-#include "hildon-helper.h"
#include <math.h>
#define HILDON_TEXT_VIEW_DRAG_THRESHOLD 16.0
struct _HildonTextViewPrivate
{
- GtkTextBuffer *main_buffer; /* Used to show the "real" contents */
- GtkTextBuffer *placeholder_buffer; /* Internal, used to display the placeholder */
- gulong changed_id; /* ID of the main_buffer::changed signal handler */
gdouble x; /* tap x position */
gdouble y; /* tap y position */
};
-/* Function used to decide whether to show the placeholder or not */
-static void
-hildon_text_view_refresh_contents (GtkWidget *text_view)
-{
- HildonTextViewPrivate *priv = HILDON_TEXT_VIEW_GET_PRIVATE (text_view);
- gint bufsize = gtk_text_buffer_get_char_count (priv->main_buffer);
-
- if ((bufsize > 0) || GTK_WIDGET_HAS_FOCUS (text_view)) {
- /* Display the main buffer if it contains text or the widget is focused */
- hildon_helper_set_logical_color (text_view, GTK_RC_TEXT, GTK_STATE_NORMAL, "ReversedTextColor");
- gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), priv->main_buffer);
- } else {
- /* Otherwise, display the placeholder */
- hildon_helper_set_logical_color (text_view, GTK_RC_TEXT, GTK_STATE_NORMAL, "ReversedSecondaryTextColor");
- gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), priv->placeholder_buffer);
- }
-}
/**
* hildon_text_view_set_buffer:
* before passing it to this function, you must remove that reference
* yourself
*
- * Note that you must never use gtk_text_view_set_buffer() to set the
- * buffer of a #HildonTextView.
- *
* Since: 2.2
+ *
+ * Deprecated: use gtk_text_view_set_buffer() instead
*/
void
hildon_text_view_set_buffer (HildonTextView *text_view,
GtkTextBuffer *buffer)
{
- HildonTextViewPrivate *priv;
-
g_return_if_fail (HILDON_IS_TEXT_VIEW (text_view));
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
-
- priv = HILDON_TEXT_VIEW_GET_PRIVATE (text_view);
-
- /* If this is the same buffer, don't do anything */
- if (buffer == priv->main_buffer)
- return;
-
- /* Disconnect the signal handler from the old buffer */
- g_signal_handler_disconnect (priv->main_buffer, priv->changed_id);
-
- /* Replace the old buffer with the new one */
- g_object_unref (priv->main_buffer);
- priv->main_buffer = g_object_ref (buffer);
-
- /* Attach a callback to the new text buffer */
- priv->changed_id =
- g_signal_connect_swapped (priv->main_buffer, "changed",
- G_CALLBACK (hildon_text_view_refresh_contents), text_view);
-
- /* Refresh textview contents */
- hildon_text_view_refresh_contents (GTK_WIDGET (text_view));
+ gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), buffer);
}
/**
* Returns the text buffer in @text_view. The reference count is not
* incremented; the caller of this function won't own a new reference.
*
- * Note that you must never use gtk_text_view_get_buffer() to get the
- * buffer from a #HildonTextView.
- *
- * Also note that placeholder text (set using
- * hildon_text_view_set_placeholder()) is never contained in this
- * buffer.
+ * Note that the placeholder text (set using
+ * hildon_gtk_text_view_set_placeholder_text()) is never contained in
+ * this buffer.
*
* Returns: a #GtkTextBuffer
*
* Since: 2.2
+ *
+ * Deprecated: use gtk_text_view_get_buffer() instead
*/
GtkTextBuffer *
hildon_text_view_get_buffer (HildonTextView *text_view)
{
- HildonTextViewPrivate *priv;
-
g_return_val_if_fail (HILDON_IS_TEXT_VIEW (text_view), NULL);
-
- priv = HILDON_TEXT_VIEW_GET_PRIVATE (text_view);
-
- /* Always return priv->main_buffer even if the placeholder is
- * being displayed */
- return priv->main_buffer;
+ return gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
}
/**
* Sets the placeholder text in @text_view to @text.
*
* Since: 2.2
+ *
+ * Deprecated: use hildon_gtk_text_view_set_placeholder_text() instead
*/
void
hildon_text_view_set_placeholder (HildonTextView *text_view,
const gchar *text)
{
- HildonTextViewPrivate *priv;
-
g_return_if_fail (HILDON_IS_TEXT_VIEW (text_view) && text != NULL);
-
- priv = HILDON_TEXT_VIEW_GET_PRIVATE (text_view);
-
- gtk_text_buffer_set_text (priv->placeholder_buffer, text, -1);
+ hildon_gtk_text_view_set_placeholder_text (GTK_TEXT_VIEW (text_view), text);
}
/**
return entry;
}
-static gboolean
-hildon_text_view_focus_in_event (GtkWidget *widget,
- GdkEventFocus *event)
-{
- hildon_text_view_refresh_contents (widget);
-
- if (GTK_WIDGET_CLASS (hildon_text_view_parent_class)->focus_in_event) {
- return GTK_WIDGET_CLASS (hildon_text_view_parent_class)->focus_in_event (widget, event);
- } else {
- return FALSE;
- }
-}
-
-static gboolean
-hildon_text_view_focus_out_event (GtkWidget *widget,
- GdkEventFocus *event)
-{
- hildon_text_view_refresh_contents (widget);
-
- if (GTK_WIDGET_CLASS (hildon_text_view_parent_class)->focus_out_event) {
- return GTK_WIDGET_CLASS (hildon_text_view_parent_class)->focus_out_event (widget, event);
- } else {
- return FALSE;
- }
-}
-
static gint
hildon_text_view_button_press_event (GtkWidget *widget,
GdkEventButton *event)
{
HildonTextViewPrivate *priv = HILDON_TEXT_VIEW_GET_PRIVATE (widget);
+ gtk_widget_grab_focus (widget);
+
if (GTK_TEXT_VIEW (widget)->editable &&
hildon_gtk_im_context_filter_event (GTK_TEXT_VIEW (widget)->im_context, (GdkEvent*)event)) {
GTK_TEXT_VIEW (widget)->need_im_reset = TRUE;
if (fabs (priv->x - event->x) < HILDON_TEXT_VIEW_DRAG_THRESHOLD &&
fabs (priv->y - event->y) < HILDON_TEXT_VIEW_DRAG_THRESHOLD) {
GtkTextWindowType window_type;
+ GtkTextBuffer *buffer;
window_type = gtk_text_view_get_window_type (text_view, event->window);
gtk_text_view_window_to_buffer_coords (text_view,
event->x, event->y,
&x, &y);
gtk_text_view_get_iter_at_location (text_view, &iter, x, y);
- if (gtk_text_buffer_get_char_count (priv->main_buffer))
- gtk_text_buffer_place_cursor (priv->main_buffer, &iter);
+ buffer = gtk_text_view_get_buffer (text_view);
+ if (gtk_text_buffer_get_char_count (buffer))
+ gtk_text_buffer_place_cursor (buffer, &iter);
gtk_widget_grab_focus (GTK_WIDGET (text_view));
}
static void
-hildon_text_view_finalize (GObject *object)
-{
- HildonTextViewPrivate *priv = HILDON_TEXT_VIEW_GET_PRIVATE (object);
-
- g_signal_handler_disconnect (priv->main_buffer, priv->changed_id);
- g_object_unref (priv->main_buffer);
- g_object_unref (priv->placeholder_buffer);
-
- if (G_OBJECT_CLASS (hildon_text_view_parent_class)->finalize)
- G_OBJECT_CLASS (hildon_text_view_parent_class)->finalize (object);
-}
-
-static void
hildon_text_view_class_init (HildonTextViewClass *klass)
{
- GObjectClass *gobject_class = (GObjectClass *)klass;
GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
- gobject_class->finalize = hildon_text_view_finalize;
- widget_class->focus_in_event = hildon_text_view_focus_in_event;
- widget_class->focus_out_event = hildon_text_view_focus_out_event;
widget_class->motion_notify_event = NULL;
widget_class->button_press_event = hildon_text_view_button_press_event;
widget_class->button_release_event = hildon_text_view_button_release_event;
g_type_class_add_private (klass, sizeof (HildonTextViewPrivate));
}
-
static void
hildon_text_view_init (HildonTextView *self)
{
- HildonTextViewPrivate *priv = HILDON_TEXT_VIEW_GET_PRIVATE (self);
-
- priv->main_buffer = gtk_text_buffer_new (NULL);
- priv->placeholder_buffer = gtk_text_buffer_new (NULL);
-
- hildon_text_view_refresh_contents (GTK_WIDGET (self));
-
- priv->changed_id =
- g_signal_connect_swapped (priv->main_buffer, "changed",
- G_CALLBACK (hildon_text_view_refresh_contents), self);
}
projects / hildon / blobdiff