Mercurial > octave-dspies

comparison libgui/graphics/Container.cc @ 18692:fe0e34be5576

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: untabify recently added code files. * Backend.cc, BaseControl.cc, ButtonControl.cc, Canvas.cc, Canvas.h, CheckBoxControl.cc, Container.cc, ContextMenu.cc, EditControl.cc, Figure.cc, Figure.h, GLCanvas.h, ListBoxControl.cc, Menu.cc, MouseModeActionGroup.cc, Object.cc, Object.h, ObjectFactory.cc, ObjectProxy.cc, Panel.cc, PopupMenuControl.cc, PushButtonControl.cc, PushTool.cc, QtHandlesUtils.cc, QtHandlesUtils.h, RadioButtonControl.cc, SliderControl.cc, TextControl.cc, ToggleButtonControl.cc, ToggleTool.cc, ToolBar.cc, ToolBarButton.cc, __init_qt__.cc, pt-jit.cc, ov-classdef.cc, ov-classdef.h: Untabify code.
author Rik <rik@octave.org>
date Sun, 27 Apr 2014 18:02:47 -0700
parents 9597e00ed2dd
children dbb207d10d7c
comparison
equal deleted inserted replaced
18691:9a6646cc7c3e 18692:fe0e34be5576
52 if (! m_canvas && create) 52 if (! m_canvas && create)
53 { 53 {
54 graphics_object go = gh_manager::get_object (handle); 54 graphics_object go = gh_manager::get_object (handle);
55 55
56 if (go) 56 if (go)
57 { 57 {
58 graphics_object fig = go.get_ancestor ("figure"); 58 graphics_object fig = go.get_ancestor ("figure");
59 59
60 m_canvas = Canvas::create (fig.get("renderer").string_value (), 60 m_canvas = Canvas::create (fig.get("renderer").string_value (),
61 this, handle); 61 this, handle);
62 62
63 QWidget* canvasWidget = m_canvas->qWidget (); 63 QWidget* canvasWidget = m_canvas->qWidget ();
64 64
65 canvasWidget->lower (); 65 canvasWidget->lower ();
66 canvasWidget->show (); 66 canvasWidget->show ();
67 canvasWidget->setGeometry (0, 0, width (), height ()); 67 canvasWidget->setGeometry (0, 0, width (), height ());
68 } 68 }
69 } 69 }
70 70
71 return m_canvas; 71 return m_canvas;
72 } 72 }
73 73
79 gh_manager::auto_lock lock; 79 gh_manager::auto_lock lock;
80 80
81 foreach (QObject* qObj, children ()) 81 foreach (QObject* qObj, children ())
82 { 82 {
83 if (qObj->isWidgetType ()) 83 if (qObj->isWidgetType ())
84 { 84 {
85 Object* obj = Object::fromQObject (qObj); 85 Object* obj = Object::fromQObject (qObj);
86 86
87 if (obj) 87 if (obj)
88 { 88 {
89 Matrix bb = obj->properties ().get_boundingbox (false); 89 Matrix bb = obj->properties ().get_boundingbox (false);
90 90
91 obj->qWidget<QWidget> () 91 obj->qWidget<QWidget> ()
92 ->setGeometry (xround (bb(0)), xround (bb(1)), 92 ->setGeometry (xround (bb(0)), xround (bb(1)),
93 xround (bb(2)), xround (bb(3))); 93 xround (bb(2)), xround (bb(3)));
94 } 94 }
95 } 95 }
96 } 96 }
97 } 97 }
98 98
99 void Container::childEvent (QChildEvent* event) 99 void Container::childEvent (QChildEvent* event)
100 { 100 {