aboutsummaryrefslogtreecommitdiffstats
path: root/src/xwidget.c
diff options
context:
space:
mode:
authorJoakim Verona2011-07-01 09:26:06 +0200
committerJoakim Verona2011-07-01 09:26:06 +0200
commit9f13671c09bfdc18336132c40a0cf5b715c8da86 (patch)
treec79aa19a2d65fd7c307fe9d1350fb205a89db139 /src/xwidget.c
parent46ddfc9dd50ea017041f969cdf715cda1118a8d2 (diff)
downloademacs-9f13671c09bfdc18336132c40a0cf5b715c8da86.tar.gz
emacs-9f13671c09bfdc18336132c40a0cf5b715c8da86.zip
gtk3 tests, tried clipping using a scrolled windew. this works but results in unwanted scrollbars.
Diffstat (limited to 'src/xwidget.c')
-rw-r--r--src/xwidget.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/xwidget.c b/src/xwidget.c
index ea880458dc1..b612bc3b283 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -553,14 +553,16 @@ xwidget_init_view (
553 //xw->widgetwindow = GTK_CONTAINER (gtk_layout_new (NULL, NULL)); 553 //xw->widgetwindow = GTK_CONTAINER (gtk_layout_new (NULL, NULL));
554 //xw->widgetwindow = GTK_CONTAINER (gtk_offscreen_window_new ()); 554 //xw->widgetwindow = GTK_CONTAINER (gtk_offscreen_window_new ());
555 555
556 xv->widgetwindow = GTK_CONTAINER (gtk_fixed_new ()); //works well for clipping on gtk2 not gtk3 556 //xv->widgetwindow = GTK_CONTAINER (gtk_fixed_new ()); //works well for clipping on gtk2 not gtk3
557 //xv->widgetwindow = GTK_CONTAINER (gtk_event_box_new ()); //doesnt help clipping gtk3 557 //xv->widgetwindow = GTK_CONTAINER (gtk_event_box_new ()); //doesnt help clipping gtk3
558 xv->widgetwindow = GTK_CONTAINER (gtk_scrolled_window_new (NULL, NULL)); //doesnt help clipping gtk3
559
558 gtk_widget_set_size_request (GTK_WIDGET (xv->widgetwindow), xww->width, xww->height); 560 gtk_widget_set_size_request (GTK_WIDGET (xv->widgetwindow), xww->width, xww->height);
559 /* GtkAllocation a; */ 561 /* GtkAllocation a; */
560 /* a.x=0; a.y=0; a.width=xww->width; a.height=xww->height; */ 562 /* a.x=0; a.y=0; a.width=xww->width; a.height=xww->height; */
561 /* gtk_widget_set_allocation (GTK_WIDGET (xv->widget), &a); */ 563 /* gtk_widget_set_allocation (GTK_WIDGET (xv->widget), &a); */
562 564
563 gtk_widget_set_has_window(GTK_WIDGET ( xv->widgetwindow), TRUE); 565 //gtk_widget_set_has_window(GTK_WIDGET ( xv->widgetwindow), TRUE);
564 //if gtk_fixed doesnt have a window it will surprisingly not honor 566 //if gtk_fixed doesnt have a window it will surprisingly not honor
565 //setsize so that children gets clipped later. the documentation is 567 //setsize so that children gets clipped later. the documentation is
566 //not consistent regarding if its legal to call this method. 568 //not consistent regarding if its legal to call this method.
@@ -571,7 +573,10 @@ xwidget_init_view (
571 573
572 574
573 //gtk_layout_set_size (GTK_LAYOUT (xw->widgetwindow), xw->width, xw->height); 575 //gtk_layout_set_size (GTK_LAYOUT (xw->widgetwindow), xw->width, xw->height);
574 gtk_container_add (xv->widgetwindow, xv->widget); 576 //gtk_container_add (xv->widgetwindow, xv->widget);
577
578 gtk_scrolled_window_add_with_viewport (xv->widgetwindow, xv->widget);
579
575 gtk_widget_set_size_request (GTK_WIDGET (xv->widget), xww->width, xww->height); 580 gtk_widget_set_size_request (GTK_WIDGET (xv->widget), xww->width, xww->height);
576 gtk_fixed_put (GTK_FIXED (s->f->gwfixed), GTK_WIDGET (xv->widgetwindow), x, y); 581 gtk_fixed_put (GTK_FIXED (s->f->gwfixed), GTK_WIDGET (xv->widgetwindow), x, y);
577 xv->x = x; xv->y = y; 582 xv->x = x; xv->y = y;