diff options
| author | Tor Lillqvist <tml@collabora.com> | 2019-02-25 19:22:55 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2019-02-25 20:10:43 +0200 |
| commit | 3d58288eae759565c5417223af80926098312328 (patch) | |
| tree | 3a9341cfa3be623b385e173d5d416eaa28f9d46c | |
| parent | 401428b9bd8c18fce4f1291f1ba974345a06943a (diff) | |
We don't want any MODELESSDIALOG dialogs in the iOS app, they don't work
(And probably the same holds for Android, too.)
This change makes at least the Format>Character... and
Format>Paragraph... dialogs in the iOS app show up. For some reason
they are claimed to be modeless, and that meant that the mechanism for
dialog display in the iOS app did not work. The exact mecahnism is
unclear to me, but the alleged modelessness was the root cause.
Change-Id: I237a5e16ec34221912a2fb062068101562ba7dbb
| -rw-r--r-- | vcl/source/window/builder.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 6bca10f17760..4fedce41c35f 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -851,6 +851,7 @@ namespace return bResizable; } +#if HAVE_FEATURE_DESKTOP bool extractModal(VclBuilder::stringmap &rMap) { bool bModal = false; @@ -862,6 +863,7 @@ namespace } return bModal; } +#endif bool extractDecorated(VclBuilder::stringmap &rMap) { @@ -1627,8 +1629,10 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & if (extractResizable(rMap)) nBits |= WB_SIZEABLE; xWindow = VclPtr<Dialog>::Create(pParent, nBits, !pParent ? Dialog::InitFlag::NoParent : Dialog::InitFlag::Default); +#if HAVE_FEATURE_DESKTOP if (!m_bLegacy && !extractModal(rMap)) xWindow->SetType(WindowType::MODELESSDIALOG); +#endif } else if (name == "GtkMessageDialog") { |