diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-22 11:33:52 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-22 15:14:04 +0100 |
| commit | 20997b4598f559d3274916dc1c343c69e8feeceb (patch) | |
| tree | 583b1aa9cba9380306d531fdb53400e3edf1dd28 /vcl | |
| parent | 40f81f1f9eb4266a897c6c5185544908d91c714e (diff) | |
factor out as a ResizableDockingWindow
Change-Id: I557ccf866cc879b3cc22fcdbca882f4413cb57d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111334
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dockwin.cxx | 24 | ||||
| -rw-r--r-- | vcl/uiconfig/ui/dockingwindow.ui | 21 |
2 files changed, 36 insertions, 9 deletions
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index bd3eac3545ef..8689e914bfd1 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -22,8 +22,8 @@ #include <vcl/accel.hxx> #include <vcl/event.hxx> #include <vcl/floatwin.hxx> -#include <vcl/dockwin.hxx> #include <vcl/layout.hxx> +#include <vcl/dockwin.hxx> #include <vcl/svapp.hxx> #include <vcl/timer.hxx> #include <vcl/idle.hxx> @@ -1078,4 +1078,26 @@ void DropdownDockingWindow::dispose() DockingWindow::dispose(); } +ResizableDockingWindow::ResizableDockingWindow(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rFrame) + : DockingWindow(pParent, "DockingWindow", "vcl/ui/dockingwindow.ui", rFrame) + , m_xBox(m_pUIBuilder->get("box")) +{ +} + +ResizableDockingWindow::ResizableDockingWindow(vcl::Window* pParent, WinBits nStyle) + : DockingWindow(pParent, nStyle) +{ +} + +ResizableDockingWindow::~ResizableDockingWindow() +{ + disposeOnce(); +} + +void ResizableDockingWindow::dispose() +{ + m_xBox.clear(); + DockingWindow::dispose(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/uiconfig/ui/dockingwindow.ui b/vcl/uiconfig/ui/dockingwindow.ui index e98da3fd004c..270946f7eae7 100644 --- a/vcl/uiconfig/ui/dockingwindow.ui +++ b/vcl/uiconfig/ui/dockingwindow.ui @@ -1,18 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.38.2 --> <interface domain="vcl"> <requires lib="gtk+" version="3.20"/> <object class="GtkWindow" id="DockingWindow"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="border_width">6</property> - <property name="type_hint">dock</property> + <property name="border-width">6</property> + <property name="type-hint">dock</property> <child> - <placeholder/> - </child> - <child> - <placeholder/> + <object class="GtkBox" id="box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <placeholder/> + </child> + </object> </child> </object> </interface> |