diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-03-07 14:05:33 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-07 14:06:17 +0000 |
| commit | 5ecb308bd3e8381d86f57206c0eed5f32d459956 (patch) | |
| tree | ad0de6bd4115ef111c24fdd5d6df51cb5f930fc0 /vcl/inc | |
| parent | 69b76536a033cefed8e024557742a9988b949d62 (diff) | |
rename setInitialLayoutSize to setOptimalLayoutSize
and add a mechanism to know that we're in true
initial layout mode
Change-Id: I4ff61160ae67a7ccf1cb8b25c41870c195d32b94
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/vcl/dialog.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/vcl/layout.hxx | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx index 7fc2a4d75ae7..1f14ae144948 100644 --- a/vcl/inc/vcl/dialog.hxx +++ b/vcl/inc/vcl/dialog.hxx @@ -52,6 +52,7 @@ private: sal_Bool mbInClose; sal_Bool mbModalMode; bool mbIsDefferedInit; + bool mbIsCalculatingInitialLayoutSize; Timer maLayoutTimer; SAL_DLLPRIVATE void ImplInitDialogData(); @@ -94,7 +95,8 @@ public: virtual Size GetOptimalSize() const; virtual void Resize(); bool isLayoutEnabled() const; - void setInitialLayoutSize(); + void setOptimalLayoutSize(); + bool isCalculatingInitialLayoutSize() const { return mbIsCalculatingInitialLayoutSize; } virtual void queue_layout(); virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); VclButtonBox* get_action_area(); diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx index 63277252d672..cd06ae6476f7 100644 --- a/vcl/inc/vcl/layout.hxx +++ b/vcl/inc/vcl/layout.hxx @@ -670,6 +670,10 @@ VCL_DLLPUBLIC inline bool isContainerWindow(const Window *pWindow) return pWindow && isContainerWindow(*pWindow); } +//Returns true if the containing dialog is doing its initial +//layout and isn't visible yet +VCL_DLLPUBLIC bool isInitialLayout(const Window *pWindow); + // retro-fitting utilities // //Get a Size which is large enough to contain all children with |