isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 12:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

interactive/text-field: Use :background-color

Browse Source 
Instead of a custom paint signal handler.
This commit is contained in:
Emmanuele Bassi 2012-03-06 15:07:55 +00:00
parent 477d399c31
commit 4db4471528
1 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/interactive/test-text-field.c
View File

@ -2,29 +2,6 @@
#include <gmodule.h> #include <gmodule.h>
#include <clutter/clutter.h> #include <clutter/clutter.h>
static void
on_entry_paint (ClutterActor *actor,
gpointer data)
{
ClutterActorBox allocation = { 0, };
gfloat width, height;
clutter_actor_get_allocation_box (actor, &allocation);
clutter_actor_box_clamp_to_pixel (&allocation);
clutter_actor_box_get_size (&allocation, &width, &height);
cogl_set_source_color4ub (255, 255, 255, 24);
#if 0
/* this spills over to the next actor in the paint cycle, and retains
* the same source color
*/
cogl_path_round_rectangle (0, 0, width, height, 4.0, 1.0);
cogl_path_stroke ();
#else
cogl_rectangle (0, 0, width, height);
#endif
}
static void static void
on_entry_activate (ClutterText *text, on_entry_activate (ClutterText *text,
gpointer data) gpointer data)
@ -252,13 +229,11 @@ create_entry (const ClutterColor *color,
clutter_text_set_cursor_color (CLUTTER_TEXT (retval), &selection); clutter_text_set_cursor_color (CLUTTER_TEXT (retval), &selection);
clutter_text_set_max_length (CLUTTER_TEXT (retval), max_length); clutter_text_set_max_length (CLUTTER_TEXT (retval), max_length);
clutter_text_set_selected_text_color (CLUTTER_TEXT (retval), &selected_text); clutter_text_set_selected_text_color (CLUTTER_TEXT (retval), &selected_text);
clutter_actor_set_background_color (retval, CLUTTER_COLOR_LightGray);
g_signal_connect (retval, "activate", g_signal_connect (retval, "activate",
G_CALLBACK (on_entry_activate), G_CALLBACK (on_entry_activate),
NULL); NULL);
g_signal_connect (retval, "paint",
G_CALLBACK (on_entry_paint),
NULL);
g_signal_connect (retval, "captured-event", g_signal_connect (retval, "captured-event",
G_CALLBACK (on_captured_event), G_CALLBACK (on_captured_event),
NULL); NULL);
@ -303,7 +278,7 @@ test_text_field_main (gint argc,
"y-expand", FALSE, "y-expand", FALSE,
NULL); NULL);
entry = create_entry (CLUTTER_COLOR_LightGray, "<i>some</i> text", 0, 0); entry = create_entry (CLUTTER_COLOR_Black, "<i>some</i> text", 0, 0);
clutter_actor_add_child (box, entry); clutter_actor_add_child (box, entry);
clutter_layout_manager_child_set (table, CLUTTER_CONTAINER (box), entry, clutter_layout_manager_child_set (table, CLUTTER_CONTAINER (box), entry,
"row", 0, "row", 0,
@ -323,7 +298,7 @@ test_text_field_main (gint argc,
"y-expand", FALSE, "y-expand", FALSE,
NULL); NULL);
entry = create_entry (CLUTTER_COLOR_LightGray, "password", '*', 8); entry = create_entry (CLUTTER_COLOR_Black, "password", '*', 8);
clutter_actor_add_child (box, entry); clutter_actor_add_child (box, entry);
clutter_layout_manager_child_set (table, CLUTTER_CONTAINER (box), entry, clutter_layout_manager_child_set (table, CLUTTER_CONTAINER (box), entry,
"row", 1, "row", 1,