Kaydet (Commit) 3d58288e authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst 401428b9
......@@ -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")
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment