summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
4c57408)
The GtkDrawingArea widgets which contain the rendered tables, must be shifted
to the right hand side of the parent widget for RTL locales.
Reported by: Mohammad Haghighat <hosseinhg@hotmail.com>
rerender (struct psppire_output_view *view)
{
struct output_view_item *item;
rerender (struct psppire_output_view *view)
{
struct output_view_item *item;
+ GdkWindow *gdkw = gtk_widget_get_window (GTK_WIDGET (view->output));
- if (!view->n_items || !gtk_widget_get_window (GTK_WIDGET (view->output)))
+ if (!view->n_items || ! gdkw)
- cr = gdk_cairo_create (gtk_widget_get_window (GTK_WIDGET (view->output)));
+ cr = gdk_cairo_create (gdkw);
if (view->xr == NULL)
create_xr (view);
view->y = 0;
if (view->xr == NULL)
create_xr (view);
view->y = 0;
xr_rendering_measure (r, &tw, &th);
xr_rendering_measure (r, &tw, &th);
+ guint w = gdk_window_get_width (gdkw);
+ gint xpos = (gtk_widget_get_direction (GTK_WIDGET (view->output)) ==
+ GTK_TEXT_DIR_RTL) ? w - tw : 0;
+
if (!item->drawing_area)
{
item->drawing_area = gtk_drawing_area_new ();
if (!item->drawing_area)
{
item->drawing_area = gtk_drawing_area_new ();
g_object_set_data_full (G_OBJECT (item->drawing_area),
"rendering", r, free_rendering);
gtk_widget_set_size_request (item->drawing_area, tw, th);
g_object_set_data_full (G_OBJECT (item->drawing_area),
"rendering", r, free_rendering);
gtk_widget_set_size_request (item->drawing_area, tw, th);
- gtk_layout_move (view->output, item->drawing_area, 0, view->y);
+ gtk_layout_move (view->output, item->drawing_area, xpos, view->y);
alloc.y = view->y;
alloc.width = tw;
alloc.height = th;
alloc.y = view->y;
alloc.width = tw;
alloc.height = th;