2008-08-23 05:41:04 +00:00
|
|
|
diff -up nautilus-2.23.90/libnautilus-private/nautilus-icon-container.c.rtl-fix nautilus-2.23.90/libnautilus-private/nautilus-icon-container.c
|
|
|
|
|
--- nautilus-2.23.90/libnautilus-private/nautilus-icon-container.c.rtl-fix 2008-08-18 19:04:40.000000000 -0400
|
2008-08-23 14:39:00 +00:00
|
|
|
+++ nautilus-2.23.90/libnautilus-private/nautilus-icon-container.c 2008-08-23 10:33:53.000000000 -0400
|
|
|
|
|
@@ -8923,40 +8923,6 @@ nautilus_icon_container_accessible_get_t
|
2007-12-22 04:34:18 +00:00
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
|
2008-08-23 14:39:00 +00:00
|
|
|
-#if ! defined (NAUTILUS_OMIT_SELF_CHECK)
|
|
|
|
|
-
|
|
|
|
|
-static char *
|
|
|
|
|
-check_compute_stretch (int icon_x, int icon_y, int icon_size,
|
|
|
|
|
- int start_pointer_x, int start_pointer_y,
|
|
|
|
|
- int end_pointer_x, int end_pointer_y)
|
2007-12-22 04:34:18 +00:00
|
|
|
-{
|
2008-08-23 14:39:00 +00:00
|
|
|
- StretchState start, current;
|
|
|
|
|
-
|
|
|
|
|
- start.icon_x = icon_x;
|
|
|
|
|
- start.icon_y = icon_y;
|
|
|
|
|
- start.icon_size = icon_size;
|
|
|
|
|
- start.pointer_x = start_pointer_x;
|
|
|
|
|
- start.pointer_y = start_pointer_y;
|
|
|
|
|
- current.pointer_x = end_pointer_x;
|
|
|
|
|
- current.pointer_y = end_pointer_y;
|
|
|
|
|
-
|
|
|
|
|
- compute_stretch (&start, ¤t);
|
2007-12-22 04:34:18 +00:00
|
|
|
-
|
2008-08-23 14:39:00 +00:00
|
|
|
- return g_strdup_printf ("%d,%d:%d",
|
|
|
|
|
- current.icon_x,
|
|
|
|
|
- current.icon_y,
|
|
|
|
|
- current.icon_size);
|
2007-12-22 04:34:18 +00:00
|
|
|
-}
|
2008-04-24 09:47:57 +00:00
|
|
|
-
|
2008-08-23 14:39:00 +00:00
|
|
|
-void
|
|
|
|
|
-nautilus_self_check_icon_container (void)
|
2008-04-24 09:47:57 +00:00
|
|
|
-{
|
2008-08-23 14:39:00 +00:00
|
|
|
- EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 0, 0, 0, 0), "0,0:16");
|
|
|
|
|
- EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 17), "0,0:17");
|
|
|
|
|
- EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 16), "0,0:16");
|
|
|
|
|
- EEL_CHECK_STRING_RESULT (check_compute_stretch (100, 100, 64, 105, 105, 40, 40), "35,35:129");
|
2008-04-24 09:47:57 +00:00
|
|
|
-}
|
|
|
|
|
-
|
2008-08-23 14:39:00 +00:00
|
|
|
gboolean
|
|
|
|
|
nautilus_icon_container_is_layout_rtl (NautilusIconContainer *container)
|
2008-08-23 05:41:04 +00:00
|
|
|
{
|
2008-08-23 14:39:00 +00:00
|
|
|
@@ -8994,4 +8960,39 @@ nautilus_icon_container_get_layout_heigh
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+#if ! defined (NAUTILUS_OMIT_SELF_CHECK)
|
|
|
|
|
+
|
|
|
|
|
+static char *
|
|
|
|
|
+check_compute_stretch (int icon_x, int icon_y, int icon_size,
|
|
|
|
|
+ int start_pointer_x, int start_pointer_y,
|
|
|
|
|
+ int end_pointer_x, int end_pointer_y)
|
|
|
|
|
+{
|
|
|
|
|
+ StretchState start, current;
|
|
|
|
|
+
|
|
|
|
|
+ start.icon_x = icon_x;
|
|
|
|
|
+ start.icon_y = icon_y;
|
|
|
|
|
+ start.icon_size = icon_size;
|
|
|
|
|
+ start.pointer_x = start_pointer_x;
|
|
|
|
|
+ start.pointer_y = start_pointer_y;
|
|
|
|
|
+ current.pointer_x = end_pointer_x;
|
|
|
|
|
+ current.pointer_y = end_pointer_y;
|
|
|
|
|
+
|
|
|
|
|
+ compute_stretch (&start, ¤t);
|
|
|
|
|
+
|
|
|
|
|
+ return g_strdup_printf ("%d,%d:%d",
|
|
|
|
|
+ current.icon_x,
|
|
|
|
|
+ current.icon_y,
|
|
|
|
|
+ current.icon_size);
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+void
|
|
|
|
|
+nautilus_self_check_icon_container (void)
|
|
|
|
|
+{
|
|
|
|
|
+ EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 0, 0, 0, 0), "0,0:16");
|
|
|
|
|
+ EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 17), "0,0:17");
|
|
|
|
|
+ EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 16), "0,0:16");
|
|
|
|
|
+ EEL_CHECK_STRING_RESULT (check_compute_stretch (100, 100, 64, 105, 105, 40, 40), "35,35:129");
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
#endif /* ! NAUTILUS_OMIT_SELF_CHECK */
|
