aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoakim Verona2011-06-27 14:22:45 +0200
committerJoakim Verona2011-06-27 14:22:45 +0200
commit78309a2cbf04a9fb4b82a35d3c912dc8baedd1e6 (patch)
tree16b1312bb80ec983d35e5b23aa1973288c341b90 /src
parent2f69e75a614ffbe94da2c81022d8313ab5c43a72 (diff)
downloademacs-78309a2cbf04a9fb4b82a35d3c912dc8baedd1e6.tar.gz
emacs-78309a2cbf04a9fb4b82a35d3c912dc8baedd1e6.zip
doc update for mvc. resize support for mvc
Diffstat (limited to 'src')
-rw-r--r--src/xwidget.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/xwidget.c b/src/xwidget.c
index 1a0c23f5d9c..427004029d4 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -362,7 +362,7 @@ x_draw_xwidget_glyph_string (struct glyph_string *s)
362 int box_line_vwidth = max (s->face->box_line_width, 0); 362 int box_line_vwidth = max (s->face->box_line_width, 0);
363 int height = s->height; 363 int height = s->height;
364 364
365 int drawing_in_selected_window = (XWINDOW (FRAME_SELECTED_WINDOW (s->f))) == (s->w); 365 //int drawing_in_selected_window = (XWINDOW (FRAME_SELECTED_WINDOW (s->f))) == (s->w);
366 //TODO drawing_in_selected_window can be true for several windows if we have several frames. 366 //TODO drawing_in_selected_window can be true for several windows if we have several frames.
367 //we also need to check that the xwidget is to be drawn inside a window on a frame where it originaly lives. 367 //we also need to check that the xwidget is to be drawn inside a window on a frame where it originaly lives.
368 //otherwise draw a phantom, or maybe reparent the xwidget. 368 //otherwise draw a phantom, or maybe reparent the xwidget.
@@ -468,10 +468,11 @@ DEFUN ("xwidget-embed-steal-window", Fxwidget_embed_steal_window, Sxwidget_embed
468 468
469 469
470DEFUN ("xwidget-resize-internal", Fxwidget_resize_internal, Sxwidget_resize_internal, 3, 3, 0, doc: 470DEFUN ("xwidget-resize-internal", Fxwidget_resize_internal, Sxwidget_resize_internal, 3, 3, 0, doc:
471 ) 471 /* resize xwidgets */)
472 (Lisp_Object xwidget_id, Lisp_Object new_width, Lisp_Object new_height) 472 (Lisp_Object xwidget_id, Lisp_Object new_width, Lisp_Object new_height)
473{ 473{
474 struct xwidget *xw; 474 struct xwidget *xw;
475 struct xwidget_view *xv;
475 int xid, w, h; 476 int xid, w, h;
476 477
477 CHECK_NUMBER (xwidget_id); 478 CHECK_NUMBER (xwidget_id);
@@ -491,6 +492,15 @@ DEFUN ("xwidget-resize-internal", Fxwidget_resize_internal, Sxwidget_resize_inte
491 gtk_widget_set_size_request (GTK_WIDGET (xw->widget), xw->width, 492 gtk_widget_set_size_request (GTK_WIDGET (xw->widget), xw->width,
492 xw->height); 493 xw->height);
493 */ 494 */
495 for (int i = 0; i < MAX_XWIDGETS; i++) //TODO MVC refactor lazy linear search
496 {
497 xv = &xwidget_views[i];
498 if(xv->model == xw){
499 gtk_layout_set_size (GTK_LAYOUT (xv->widgetwindow), xw->width, xw->height);
500 gtk_widget_set_size_request (GTK_WIDGET (xv->widget), xw->width, xw->height);
501 }
502 }
503
494 return Qnil; 504 return Qnil;
495} 505}
496 506