aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/text/e-entry.c
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2003-02-10 10:21:47 +0800
committerChris Toshok <toshok@src.gnome.org>2003-02-10 10:21:47 +0800
commit18d96c5ff3a43c4ca830a08a1f0a76a2a002895e (patch)
tree545ad68d32baf1c78a2a43c9b2b9aad7535f9674 /widgets/text/e-entry.c
parent23c65aa0bf31030485e5131c7e796f11bfe462d6 (diff)
downloadgsoc2013-evolution-18d96c5ff3a43c4ca830a08a1f0a76a2a002895e.tar.gz
gsoc2013-evolution-18d96c5ff3a43c4ca830a08a1f0a76a2a002895e.tar.zst
gsoc2013-evolution-18d96c5ff3a43c4ca830a08a1f0a76a2a002895e.zip
ignore test-completion.
2003-02-09 Chris Toshok <toshok@ximian.com> * tests/.cvsignore: ignore test-completion. * tests/test-completion.c: new program, completion test. * tests/Makefile.am (noinst_PROGRAMS): add test-completion. * gal/e-text/Makefile.am: remove e-completion-test from the build here, moving it to ../../tests. * gal/e-text/e-completion.c (e_completion_class_init): we've removed the restart, cancel, clear, and lost signals. Also, we've renamed some so it's easier to tell from the name which it is (virtual func or signal.) (e_completion_dispose): remove call to clear_search_stack, as we don't do auto-refinement anymore. (e_completion_clear): gone. (e_completion_push_search): gone. (e_completion_pop_search): gone. (e_completion_clear_search_stack): gone. (e_completion_refine_search): gone. (e_completion_unrefine_search): gone. (e_completion_begin_search): substantially clear this up, since we don't have the refinement stuff anymore. Also, the call to request_completion is a virtual function call, not a signal. (e_completion_match_count): always return matches->len here, never match_count, which is gone (with the refinement stuff) (e_completion_foreach_match): remove the hit_count stuff. (e_completion_restart): gone. (e_completion_lost_match): gone. (e_completion_end_search): remove the sorting stuff from here (and the call to restart.) the etable sorting stuff will have to take up the slack, but for now there's no reason to restart the search here. * gal/e-text/e-completion.h (struct _ECompletionClass): straighten out what's a virtual function and what's a signal, instead of using signals for both. Also, remove the auto_refine stuff, as it's not used. * gal/e-text/e-completion-view.c (e_completion_view_size_request): make the damn drop down window bigger (100 pixels, or the requisition height, whichever is bigger.) (e_completion_view_disconnect): remove handling for signals that are gone. (restart_completion_cb): gone. (cancel_completion_cb): gone. (clear_completion_cb): gone. (lost_completion_cb): gone. (e_completion_view_construct): track new names of ECompletion signals. * gal/e-text/e-completion-view.h (struct _ECompletionView): remove restart_signal_id, cancel_signal_id, clear_signal_id, and lost_signal_id. * gal/e-text/e-entry.c (get_borders): new function, ala gtkentry. (canvas_size_request): use get_borders instead of computing it here. (e_entry_init): remove duplicate assignment of emulate_label_resize. (e_entry_show_popup): remove some ifdef'ed crap. (e_entry_start_completion): don't cancel the completion before starting again. This keeps the popup from disappearing. * gal/e-text/e-completion-match.c (e_completion_match_construct): no more hit_count. * gal/e-text/e-completion-match.h (struct _ECompletionMatch): remove hit_count. * gal/e-text/e-completion-callbacks.[ch]: new class so we can use callbacks instead of subclassing. svn path=/trunk/; revision=19859
Diffstat (limited to 'widgets/text/e-entry.c')
-rw-r--r--widgets/text/e-entry.c78
1 files changed, 29 insertions, 49 deletions
diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c
index a297f1d26a..130b66f02d 100644
--- a/widgets/text/e-entry.c
+++ b/widgets/text/e-entry.c
@@ -42,15 +42,8 @@
#include "e-text.h"
#include "e-entry.h"
-#define MOVE_RIGHT_AND_UP 0
-
-#define EVIL_POINTER_WARPING_HACK
-
-#ifdef EVIL_POINTER_WARPING_HACK
-#include <gdk/gdkx.h>
-#endif
-
#define MIN_ENTRY_WIDTH 150
+#define INNER_BORDER 2
#define d(x)
@@ -166,6 +159,30 @@ canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
}
static void
+get_borders (EEntry *entry,
+ gint *xborder,
+ gint *yborder)
+{
+ GtkWidget *widget = GTK_WIDGET (entry);
+ gint focus_width;
+ gboolean interior_focus;
+
+ gtk_widget_style_get (widget,
+ "interior-focus", &interior_focus,
+ "focus-line-width", &focus_width,
+ NULL);
+
+ *xborder = widget->style->xthickness;
+ *yborder = widget->style->ythickness;
+
+ if (!interior_focus)
+ {
+ *xborder += focus_width;
+ *yborder += focus_width;
+ }
+}
+
+static void
canvas_size_request (GtkWidget *widget, GtkRequisition *requisition,
EEntry *entry)
{
@@ -177,10 +194,8 @@ canvas_size_request (GtkWidget *widget, GtkRequisition *requisition,
g_return_if_fail (GNOME_IS_CANVAS (widget));
g_return_if_fail (requisition != NULL);
-
if (entry->priv->draw_borders) {
- xthick = 2 * widget->style->xthickness;
- ythick = 2 * widget->style->ythickness;
+ get_borders (entry, &xthick, &ythick);
} else {
xthick = ythick = 0;
}
@@ -190,7 +205,7 @@ canvas_size_request (GtkWidget *widget, GtkRequisition *requisition,
g_object_get (entry->item,
"text_width", &width,
NULL);
- requisition->width = 2 + xthick + width;
+ requisition->width = 2 + 2 * xthick + width;
} else {
requisition->width = 2 + MIN_ENTRY_WIDTH + xthick;
}
@@ -207,7 +222,7 @@ canvas_size_request (GtkWidget *widget, GtkRequisition *requisition,
requisition->height = (2 +
PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
pango_font_metrics_get_descent (metrics)) +
- ythick);
+ 2 * ythick);
pango_font_metrics_unref (metrics);
}
@@ -287,8 +302,6 @@ e_entry_init (GtkObject *object)
entry->priv->emulate_label_resize = FALSE;
- entry->priv->emulate_label_resize = FALSE;
-
entry->canvas = GNOME_CANVAS (e_canvas_new ());
g_signal_connect (entry->canvas,
@@ -500,43 +513,12 @@ e_entry_show_popup (EEntry *entry, gboolean visible)
x = xo + dim->x;
y = yo + dim->height + dim->y;
-#if MOVE_RIGHT_AND_UP
- /* Put our popup slightly to the right and up, to try to give a visual cue that this popup
- is tied to this entry. Otherwise one-row popups can sort of "blend" with an entry
- directly below. */
- fudge = MAX (dim->height/10, 3); /* just in case we are using a really big font, etc. */
- x += 2*fudge;
- y -= fudge;
-#else
fudge = 1;
y -= fudge;
-#endif
+
gtk_widget_set_uposition (pop, x, y);
e_completion_view_set_width (E_COMPLETION_VIEW (entry->priv->completion_view), dim->width);
-#ifdef EVIL_POINTER_WARPING_HACK
- /*
- I should have learned by now to listen to Havoc...
- http://developer.gnome.org/doc/GGAD/faqs.html
- */
-
- if (! entry->priv->popup_is_visible) {
- GdkWindow *gwin = GTK_WIDGET (entry)->window;
- gint xx, yy;
- gdk_window_get_pointer (gwin, &xx, &yy, NULL);
- xx += xo;
- yy += yo;
-
- /* If we are inside the "zone of death" where the popup will appear, warp the pointer to safety.
- This is a horrible thing to do. */
- if (y <= yy && yy < yy + dim->height && x <= xx && xx < xx + dim->width) {
- XWarpPointer (GDK_WINDOW_XDISPLAY (gwin), None, GDK_WINDOW_XWINDOW (gwin),
- 0, 0, 0, 0,
- xx - xo, (y-1) - yo);
- }
- }
-#endif
-
gtk_widget_show (pop);
@@ -584,8 +566,6 @@ e_entry_start_completion (EEntry *entry)
if (entry->priv->completion == NULL)
return;
- e_entry_cancel_delayed_completion (entry);
-
if (e_entry_is_empty (entry))
return;