ui.selection->new_x1 = ui.selection->bbox.left;
ui.selection->new_x2 = ui.selection->bbox.right;
gnome_canvas_item_set(ui.selection->canvas_item, "dash", NULL, NULL);
+ update_cursor_for_resize(pt);
return TRUE;
}
return FALSE;
}
p+= 2*item->path->num_points*sizeof(double);
if (item->brush.variable_width) {
- g_memmove(p, item->widths, (item->path->num_points-1)*sizeof(double));
+ item->widths = g_memdup(p, (item->path->num_points-1)*sizeof(double));
p+= (item->path->num_points-1)*sizeof(double);
}
else item->widths = NULL;
gtk_selection_data_free(sel_data);
update_copy_paste_enabled();
+ update_color_menu();
+ update_thickness_buttons();
+ update_color_buttons();
+ update_font_button();
+ update_cursor(); // FIXME: can't know if pointer is within selection!
}
// modify the color or thickness of pen strokes in a selection
-void recolor_selection(int color)
+void recolor_selection(int color_no, guint color_rgba)
{
GList *itemlist;
struct Item *item;
g_memmove(brush, &(item->brush), sizeof(struct Brush));
undo->auxlist = g_list_append(undo->auxlist, brush);
// repaint the stroke
- item->brush.color_no = color;
- item->brush.color_rgba = predef_colors_rgba[color];
+ item->brush.color_no = color_no;
+ item->brush.color_rgba = color_rgba;
if (item->canvas_item!=NULL) {
if (!item->brush.variable_width)
gnome_canvas_item_set(item->canvas_item,
GnomeCanvasItem *canvas_item;
PangoFontDescription *font_desc;
GdkColor color;
-
+
get_pointer_coords(event, pt);
+
ui.cur_item_type = ITEM_TEXT;
+ // HACK TO BYPASS GTK+ 2.17 issue: crash if move text within selection
+ // also bypass: non-responsiveness of clicks in text box with 2.17 & 2.18
+ if (!gtk_check_version(2, 17, 0)) {
+ /* ask the canvas's leave-notify handler to disable
+ xinput when it's safe to do so... */
+ ui.need_emergency_disable_xinput = TRUE;
+ }
+
if (item==NULL) {
item = g_new(struct Item, 1);
item->text = NULL;
item->canvas_item = canvas_item;
gtk_widget_show(item->widget);
- gtk_widget_grab_focus(item->widget);
ui.resize_signal_handler =
g_signal_connect((gpointer) winMain, "check_resize",
G_CALLBACK(resize_textview), NULL);
update_font_button();
gtk_widget_set_sensitive(GET_COMPONENT("editPaste"), FALSE);
gtk_widget_set_sensitive(GET_COMPONENT("buttonPaste"), FALSE);
+ gtk_widget_grab_focus(item->widget);
}
void end_text(void)
GnomeCanvasItem *tmpitem;
if (ui.cur_item_type!=ITEM_TEXT) return; // nothing for us to do!
+
+ // HACK TO BYPASS GTK+ 2.17 issues
+ if (!gtk_check_version(2, 17, 0)) {
+ // re-enable XInput if needed (we disabled it during text edition)
+ gtk_widget_set_extension_events(GTK_WIDGET (canvas),
+ ui.use_xinput?GDK_EXTENSION_EVENTS_ALL:GDK_EXTENSION_EVENTS_NONE);
+ }
// finalize the text that's been edited...
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(ui.cur_item->widget));
else *p=0;
}
else size=0.;
- reset_focus();
g_free(ui.font_name);
ui.font_name = str;
if (size>0.) ui.font_size = size;