Fixed|libgui: Don't assume there is a shared blur widget

skyjake · Sep 1, 2019 · ba4c746 · ba4c746
1 parent e65d95d
commit ba4c746
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/doomsday/libs/gui/src/widgets/dialogwidget.cpp b/doomsday/libs/gui/src/widgets/dialogwidget.cpp
@@ -445,9 +445,16 @@ DE_GUI_PIMPL(DialogWidget)
         }
         else if (style().isBlurringAllowed())
         {
-            /// @todo Should use the Style for this.
-            bg.type = Background::SharedBlurWithBorderGlow;
-            bg.blur = style().sharedBlurWidget();
+            if (auto *blur = style().sharedBlurWidget())
+            {
+                bg.type = Background::SharedBlurWithBorderGlow;
+                bg.blur = blur;
+            }
+            else
+            {
+                bg.type = Background::BlurredWithBorderGlow;
+                bg.blur = nullptr;
+            }
             bg.solidFill = Vec4f(0, 0, 0, .65f);
         }
         else

diff --git a/doomsday/libs/gui/src/widgets/popupwidget.cpp b/doomsday/libs/gui/src/widgets/popupwidget.cpp
@@ -205,8 +205,10 @@ DE_GUI_PIMPL(PopupWidget)
         else
         {
             Background bg(st.colors().colorf("background"),
-                          !opaqueBackground && st.isBlurringAllowed()?
-                              Background::SharedBlurWithBorderGlow : Background::BorderGlow,
+                          !opaqueBackground && st.isBlurringAllowed()
+                              ? (style().sharedBlurWidget() ? Background::SharedBlurWithBorderGlow
+                                                            : Background::BlurredWithBorderGlow)
+                              : Background::BorderGlow,
                           st.colors().colorf("glow"),
                           st.rules().rule("glow").valuei());
             bg.blur = style().sharedBlurWidget();