X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdialogs%2Ffind.cpp;h=1418a0212f0f0477b594336384d0c8e26ceb357d;hb=b51ec9ee0a6f46a4616c6a8b64edafc41263c660;hp=c5d2e6eed036a2833f521214b4b010b74b92c87c;hpb=c87d0307348fcfdc65b6b4ab6999a3cb0de2431f;p=inkscape.git

diff --git a/src/dialogs/find.cpp b/src/dialogs/find.cpp
index c5d2e6eed..1418a0212 100644
--- a/src/dialogs/find.cpp
+++ b/src/dialogs/find.cpp
@@ -51,6 +51,7 @@ sp_find_dialog(){
 #include "../sp-flowtext.h"
 #include "../text-editing.h"
 #include "../sp-tspan.h"
+#include "../sp-tref.h"
 #include "../selection-chemistry.h"
 #include "../sp-defs.h"
 #include "../sp-rect.h"
@@ -66,6 +67,8 @@ sp_find_dialog(){
 #include "../sp-offset.h"
 #include <xml/repr.h>
 
+#define MIN_ONSCREEN_DISTANCE 50
+
 using NR::X;
 using NR::Y;
 
@@ -88,7 +91,7 @@ static void sp_find_dialog_destroy(GtkObject *object, gpointer)
 
 
 
-static bool sp_find_dialog_delete(GtkObject *, GdkEvent *, gpointer data)
+static gboolean sp_find_dialog_delete(GtkObject *, GdkEvent *, gpointer /*data*/)
 {
     gtk_window_get_position (GTK_WINDOW (dlg), &x, &y);
     gtk_window_get_size (GTK_WINDOW (dlg), &w, &h);
@@ -236,7 +239,7 @@ item_type_match (SPItem *item, GtkWidget *widget)
     } else if (SP_IS_PATH(item) || SP_IS_LINE(item) || SP_IS_POLYLINE(item)) {
         return (type_checkbox (widget, "paths"));
 
-    } else if (SP_IS_TEXT(item) || SP_IS_TSPAN(item) || SP_IS_STRING(item)) {
+    } else if (SP_IS_TEXT(item) || SP_IS_TSPAN(item) || SP_IS_TREF(item) || SP_IS_STRING(item)) {
         return (type_checkbox (widget, "texts"));
 
     } else if (SP_IS_GROUP(item) && !desktop->isLayer(item) ) { // never select layers!
@@ -476,7 +479,7 @@ toggle_shapes (GtkToggleButton *tb, gpointer data)
 
 
 GtkWidget *
-sp_find_types_checkbox (GtkWidget *w, const gchar *data, bool active,
+sp_find_types_checkbox (GtkWidget *w, const gchar *data, gboolean active,
                         GtkTooltips *tt, const gchar *tip,
                         const gchar *label,
                         void (*toggled)(GtkToggleButton *, gpointer))
@@ -499,7 +502,7 @@ sp_find_types_checkbox (GtkWidget *w, const gchar *data, bool active,
 }
 
 GtkWidget *
-sp_find_types_checkbox_indented (GtkWidget *w, const gchar *data, bool active,
+sp_find_types_checkbox_indented (GtkWidget *w, const gchar *data, gboolean active,
                                  GtkTooltips *tt, const gchar *tip,
                                  const gchar *label,
                                  void (*toggled)(GtkToggleButton *, gpointer), guint indent)
@@ -645,24 +648,24 @@ sp_find_dialog_old (void)
 
         dlg = sp_window_new (title, TRUE);
         if (x == -1000 || y == -1000) {
-            x = prefs_get_int_attribute (prefs_path, "x", 0);
-            y = prefs_get_int_attribute (prefs_path, "y", 0);
+            x = prefs_get_int_attribute (prefs_path, "x", -1000);
+            y = prefs_get_int_attribute (prefs_path, "y", -1000);
         }
         if (w ==0 || h == 0) {
             w = prefs_get_int_attribute (prefs_path, "w", 0);
             h = prefs_get_int_attribute (prefs_path, "h", 0);
         }
         
-        if (x<0) x=0;
-        if (y<0) y=0;
+//        if (x<0) x=0;
+//        if (y<0) y=0;
 
-        if (x != 0 || y != 0) {
+        if (w && h)
+            gtk_window_resize ((GtkWindow *) dlg, w, h);
+        if (x >= 0 && y >= 0 && (x < (gdk_screen_width()-MIN_ONSCREEN_DISTANCE)) && (y < (gdk_screen_height()-MIN_ONSCREEN_DISTANCE))) {
             gtk_window_move ((GtkWindow *) dlg, x, y);
         } else {
             gtk_window_set_position(GTK_WINDOW(dlg), GTK_WIN_POS_CENTER);
         }
-        if (w && h)
-            gtk_window_resize ((GtkWindow *) dlg, w, h);
 
         sp_transientize (dlg);
         wd.win = dlg;