summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/vcl/dialog.hxx4
-rw-r--r--vcl/inc/vcl/layout.hxx4
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