![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 6274215cfd413c8ccaec71eae5ce659acc67465a..ea666070feaa1edcaa7d10dedaa06dd19d87ce5f 100644 (file)
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+
+#include <cstring>
+#include <string>
#include <libnr/nr-macros.h>
#include <gtk/gtk.h>
-
#include <glibmm/i18n.h>
+
#include "../style.h"
#include "../dialogs/dialog-events.h"
static void sp_dash_selector_class_init (SPDashSelectorClass *klass);
static void sp_dash_selector_init (SPDashSelector *dsel);
static GtkWidget *sp_dash_selector_menu_item_new (SPDashSelector *dsel, double *pattern);
+static void sp_dash_selector_menu_item_image_realize (GtkWidget *mi, double *pattern);
static void sp_dash_selector_dash_activate (GtkObject *object, SPDashSelector *dsel);
static void sp_dash_selector_offset_value_changed (GtkAdjustment *adj, SPDashSelector *dsel);
GtkWidget *sb = gtk_spin_button_new (GTK_ADJUSTMENT (dsel->offset), 0.1, 2);
gtk_tooltips_set_tip (tt, sb, _("Pattern offset"), NULL);
- sp_dialog_defocus_on_enter (sb);
+ sp_dialog_defocus_on_enter (sb);
gtk_widget_show (sb);
gtk_box_pack_start (GTK_BOX (dsel), sb, FALSE, FALSE, 0);
gtk_signal_connect (dsel->offset, "value_changed", GTK_SIGNAL_FUNC (sp_dash_selector_offset_value_changed), dsel);
if (ndashes > 0) {
int pos = 0;
- SPStyle *style = sp_style_new ();
+ SPStyle *style = sp_style_new (NULL);
dashes = g_new (double *, ndashes + 1);
for (Inkscape::XML::Node *dr = drepr->firstChild(); dr; dr = dr->next()) {
if (!strcmp (dr->name(), "dash")) {
sp_dash_selector_menu_item_new (SPDashSelector *dsel, double *pattern)
{
GtkWidget *mi = gtk_menu_item_new ();
+ GtkWidget *px = gtk_image_new_from_pixmap (NULL, NULL);
+
+ gtk_widget_show (px);
+ gtk_container_add (GTK_CONTAINER (mi), px);
- GdkPixmap *pixmap = gdk_pixmap_new (GTK_WIDGET (dsel)->window, DASH_PREVIEW_LENGTH + 4, 16, gdk_visual_get_best_depth ());
+ gtk_object_set_data (GTK_OBJECT (mi), "pattern", pattern);
+ gtk_object_set_data (GTK_OBJECT (mi), "px", px);
+ gtk_signal_connect (GTK_OBJECT (mi), "activate", G_CALLBACK (sp_dash_selector_dash_activate), dsel);
+
+ g_signal_connect_after(G_OBJECT(px), "realize", G_CALLBACK(sp_dash_selector_menu_item_image_realize), pattern);
+
+ return mi;
+}
+
+static void sp_dash_selector_menu_item_image_realize (GtkWidget *px, double *pattern) {
+ GdkPixmap *pixmap = gdk_pixmap_new(px->window, DASH_PREVIEW_LENGTH + 4, 16, -1);
GdkGC *gc = gdk_gc_new (pixmap);
gdk_rgb_gc_set_foreground (gc, 0xffffffff);
// FIXME: all of the below twibblering is due to the limitations of gdk_gc_set_dashes (only integers, no zeroes).
// Perhaps would make sense to rework this with manually drawn dashes.
-
+
// Fill in the integer array of pixel-lengths, for display
gint8 pixels_i[64];
gdouble pixels_d[64];
gdouble pixels = DASH_PREVIEW_WIDTH * pattern[i_s];
if (pixels > 0.0)
- pixels_d [i_p] += pixels;
+ pixels_d [i_p] += pixels;
else {
if (i_p >= 1) {
// dash is zero, skip this element in the array, and set pointer backwards so the next dash is added to the previous
n_pixel_dashes = i_p;
gdouble longest_dash = 0.0;
-
+
// after summation, convert double dash lengths to ints
for (i_p = 0; i_p < n_pixel_dashes; i_p ++) {
pixels_i [i_p] = (gint8) (pixels_d [i_p] + 0.5);
// zero-length dashes are already eliminated, so the <1 dash is short but not zero;
// we approximate it with a one-pixel mark
- if (pixels_i [i_p] < 1)
+ if (pixels_i [i_p] < 1)
pixels_i [i_p] = 1;
if (i_p % 2 == 0) { // it's a dash
if (pixels_d [i_p] > longest_dash)
} else if (all_odd_are_zero (pattern, n_source_dashes)) {
// draw solid line, only dashes are non-zero
gdk_gc_set_line_attributes (gc, DASH_PREVIEW_WIDTH,
- GDK_LINE_SOLID, GDK_CAP_BUTT,
+ GDK_LINE_SOLID, GDK_CAP_BUTT,
GDK_JOIN_MITER);
gdk_draw_line (pixmap, gc, 4, 8, DASH_PREVIEW_LENGTH, 8);
} else {
// regular pattern with both gaps and dashes non-zero
- gdk_gc_set_line_attributes (gc, DASH_PREVIEW_WIDTH,
- GDK_LINE_ON_OFF_DASH, GDK_CAP_BUTT,
+ gdk_gc_set_line_attributes (gc, DASH_PREVIEW_WIDTH,
+ GDK_LINE_ON_OFF_DASH, GDK_CAP_BUTT,
GDK_JOIN_MITER);
gdk_gc_set_dashes (gc, 0, pixels_i, n_pixel_dashes);
gdk_draw_line (pixmap, gc, 4, 8, DASH_PREVIEW_LENGTH, 8);
}
} else {
// no pattern, draw solid line
- gdk_gc_set_line_attributes (gc, DASH_PREVIEW_WIDTH,
- GDK_LINE_SOLID, GDK_CAP_BUTT,
+ gdk_gc_set_line_attributes (gc, DASH_PREVIEW_WIDTH,
+ GDK_LINE_SOLID, GDK_CAP_BUTT,
GDK_JOIN_MITER);
gdk_draw_line (pixmap, gc, 4, 8, DASH_PREVIEW_LENGTH, 8);
}
gdk_gc_unref (gc);
- GtkWidget *px = gtk_pixmap_new (pixmap, NULL);
-
- gdk_pixmap_unref (pixmap);
-
- gtk_widget_show (px);
- gtk_container_add (GTK_CONTAINER (mi), px);
-
- gtk_object_set_data (GTK_OBJECT (mi), "pattern", pattern);
- gtk_signal_connect (GTK_OBJECT (mi), "activate", G_CALLBACK (sp_dash_selector_dash_activate), dsel);
-
- return mi;
+ gtk_image_set_from_pixmap(GTK_IMAGE(px), pixmap, NULL);
+ gdk_pixmap_unref(pixmap);
}
static void