Changeset 5050

Timestamp:

Feb 16, 2008, 7:36:07 PM (14 years ago)

Author:

charles

Message:

(gtk) #703: fix right-to-left locale issues in the details dialog

Location:

trunk/gtk

Files:

• torrent-cell-renderer.c (modified) (3 diffs)
• torrent-inspector.c (modified) (3 diffs)

trunk/gtk/torrent-cell-renderer.c

@@ -20 +20 @@
 #include "tr_torrent.h"
 #include "util.h"
+
+/* #define TEST_RTL */
 
 enum
@@ -516 +518 @@
 {
     TorrentCellRenderer * self = TORRENT_CELL_RENDERER( cell );
+
+#ifdef TEST_RTL
+    GtkTextDirection real_dir = gtk_widget_get_direction( widget );
+    gtk_widget_set_direction( widget, GTK_TEXT_DIR_RTL );
+#endif
+
     if( self && self->priv->tor )
     {
@@ -650 +658 @@
         }
     }
+
+#ifdef TEST_RTL
+    gtk_widget_set_direction( widget, real_dir );
+#endif
 }
 

trunk/gtk/torrent-inspector.c

@@ -64 +64 @@
 
 static gboolean
-refresh_pieces (GtkWidget * da, GdkEventExpose * event UNUSED, gpointer gtor)
+refresh_pieces( GtkWidget * da, GdkEventExpose * event UNUSED, gpointer gtor )
 {
   tr_torrent * tor = tr_torrent_handle( TR_TORRENT(gtor) );
@@ -80 +80 @@
   const int piece_w_int = (int) (piece_w + 1); /* pad for roundoff */
   const int piece_h_int = (int) (piece_h + 1); /* pad for roundoff */
+  const gboolean rtl = gtk_widget_get_direction( da ) == GTK_TEXT_DIR_RTL;
+
   guint8 * prev_color = NULL;
   gboolean first_time = FALSE;
@@ -158 +160 @@
   for (y=0; y<n_rows; ++y) {
     for (x=0; x<n_cols; ++x) {
-      const int draw_x = grid_bounds.x + (int)(x * piece_w);
-      const int draw_y = grid_bounds.y + (int)(y * piece_h);
+      int draw_x = grid_bounds.x + (int)(x * piece_w);
+      int draw_y = grid_bounds.y + (int)(y * piece_h);
       int color = BLACK;
       int border = BLACK;
+
+      if( rtl )
+          draw_x = grid_bounds.x + grid_bounds.width - (int)((x+1) * piece_w);
+      else
+          draw_x = grid_bounds.x + (int)(x * piece_w);
+      draw_y = grid_bounds.y + (int)(y * piece_h);
 
       if (i < n_cells)