Optimize/simplify dialog shading slightly

- move creation to c'tor
 - apply position and size with one method instead of two

src/common/FBSurfaceSDL2.cxx

@@ -104,41 +104,49 @@ const Common::Rect& FBSurfaceSDL2::dstRect() const
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void FBSurfaceSDL2::setSrcPos(uInt32 x, uInt32 y)
 {
-  if(x != static_cast<uInt32>(mySrcR.x) || y != static_cast<uInt32>(mySrcR.y))
+  if(setSrcPosInternal(x, y))
-  {
-    setSrcPosInternal(x, y);
     reinitializeBlitter();
-  }
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void FBSurfaceSDL2::setSrcSize(uInt32 w, uInt32 h)
 {
-  if(w != static_cast<uInt32>(mySrcR.w) || h != static_cast<uInt32>(mySrcR.h))
+  if(setSrcSizeInternal(w, h))
-  {
+    reinitializeBlitter();
-    setSrcSizeInternal(w, h);
+}
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+void FBSurfaceSDL2::setSrcRect(const Common::Rect& r)
+{
+  const bool posChanged = setSrcPosInternal(r.x(), r.y()),
+             sizeChanged = setSrcSizeInternal(r.w(), r.h());
+
+  if(posChanged || sizeChanged)
     reinitializeBlitter();
-  }
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void FBSurfaceSDL2::setDstPos(uInt32 x, uInt32 y)
 {
-  if(x != static_cast<uInt32>(myDstR.x) || y != static_cast<uInt32>(myDstR.y))
+  if(setDstPosInternal(x, y))
-  {
-    setDstPosInternal(x, y);
     reinitializeBlitter();
-  }
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void FBSurfaceSDL2::setDstSize(uInt32 w, uInt32 h)
 {
-  if(w != static_cast<uInt32>(myDstR.w) || h != static_cast<uInt32>(myDstR.h))
+  if(setDstSizeInternal(w, h))
-  {
+    reinitializeBlitter();
-    setDstSizeInternal(w, h);
+}
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+void FBSurfaceSDL2::setDstRect(const Common::Rect& r)
+{
+  const bool posChanged = setDstPosInternal(r.x(), r.y()),
+             sizeChanged = setDstSizeInternal(r.w(), r.h());
+
+  if(posChanged || sizeChanged)
     reinitializeBlitter();
-  }
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

src/common/FBSurfaceSDL2.hxx

@@ -48,8 +48,11 @@ class FBSurfaceSDL2 : public FBSurface
     const Common::Rect& dstRect() const override;
     void setSrcPos(uInt32 x, uInt32 y) override;
     void setSrcSize(uInt32 w, uInt32 h) override;
+    void setSrcRect(const Common::Rect& r) override;
     void setDstPos(uInt32 x, uInt32 y) override;
     void setDstSize(uInt32 w, uInt32 h) override;
+    void setDstRect(const Common::Rect& r) override;
+
     void setVisible(bool visible) override;
 
     void translateCoords(Int32& x, Int32& y) const override;
@@ -67,21 +70,41 @@ class FBSurfaceSDL2 : public FBSurface
     void applyAttributes() override;
 
   private:
-    inline void setSrcPosInternal(uInt32 x, uInt32 y) {
+    inline bool setSrcPosInternal(uInt32 x, uInt32 y) {
-      mySrcR.x = x;  mySrcR.y = y;
+      if(x != static_cast<uInt32>(mySrcR.x) || y != static_cast<uInt32>(mySrcR.y))
-      mySrcGUIR.moveTo(x, y);
+      {
+        mySrcR.x = x;  mySrcR.y = y;
+        mySrcGUIR.moveTo(x, y);
+        return true;
+      }
+      return false;
     }
-    inline void setSrcSizeInternal(uInt32 w, uInt32 h) {
+    inline bool setSrcSizeInternal(uInt32 w, uInt32 h) {
-      mySrcR.w = w;  mySrcR.h = h;
+      if(w != static_cast<uInt32>(mySrcR.w) || h != static_cast<uInt32>(mySrcR.h))
-      mySrcGUIR.setWidth(w);  mySrcGUIR.setHeight(h);
+      {
+        mySrcR.w = w;  mySrcR.h = h;
+        mySrcGUIR.setWidth(w);  mySrcGUIR.setHeight(h);
+        return true;
+      }
+      return false;
     }
-    inline void setDstPosInternal(uInt32 x, uInt32 y) {
+    inline bool setDstPosInternal(uInt32 x, uInt32 y) {
-      myDstR.x = x;  myDstR.y = y;
+      if(x != static_cast<uInt32>(myDstR.x) || y != static_cast<uInt32>(myDstR.y))
-      myDstGUIR.moveTo(x, y);
+      {
+        myDstR.x = x;  myDstR.y = y;
+        myDstGUIR.moveTo(x, y);
+        return true;
+      }
+      return false;
     }
-    inline void setDstSizeInternal(uInt32 w, uInt32 h) {
+    inline bool setDstSizeInternal(uInt32 w, uInt32 h) {
-      myDstR.w = w;  myDstR.h = h;
+      if(w != static_cast<uInt32>(myDstR.w) || h != static_cast<uInt32>(myDstR.h))
-      myDstGUIR.setWidth(w);  myDstGUIR.setHeight(h);
+      {
+        myDstR.w = w;  myDstR.h = h;
+        myDstGUIR.setWidth(w);  myDstGUIR.setHeight(h);
+        return true;
+      }
+      return false;
     }
 
     void createSurface(uInt32 width, uInt32 height, const uInt32* data);
@@ -103,7 +126,7 @@ class FBSurfaceSDL2 : public FBSurface
         {ScalingInterpolation::none};
 
     SDL_Surface* mySurface{nullptr};
-    SDL_Rect mySrcR{0, 0, 0, 0}, myDstR{0, 0, 0, 0};
+    SDL_Rect mySrcR{-1, -1, -1, -1}, myDstR{-1, -1, -1, -1};
 
     bool myIsVisible{true};
     bool myIsStatic{false};

src/emucore/FBSurface.hxx

@@ -292,11 +292,14 @@ class FBSurface
       These methods set the origin point and width/height for the
       specified service.  They are defined as separate x/y and w/h
       methods since these items are sometimes set separately.
+      Other times they are set together, so we can use a Rect instead.
     */
     virtual void setSrcPos(uInt32 x, uInt32 y)  = 0;
     virtual void setSrcSize(uInt32 w, uInt32 h) = 0;
+    virtual void setSrcRect(const Common::Rect& r) = 0;
     virtual void setDstPos(uInt32 x, uInt32 y)  = 0;
     virtual void setDstSize(uInt32 w, uInt32 h) = 0;
+    virtual void setDstRect(const Common::Rect& r) = 0;
 
     /**
       This method should be called to enable/disable showing the surface

src/gui/Dialog.cxx

@@ -53,6 +53,18 @@ Dialog::Dialog(OSystem& instance, DialogContainer& parent, const GUI::Font& font
 {
   _flags = Widget::FLAG_ENABLED | Widget::FLAG_BORDER | Widget::FLAG_CLEARBG;
   setTitle(title);
+
+  // Create shading surface
+  uInt32 data = 0xff000000;
+
+  _shadeSurface = instance.frameBuffer().allocateSurface(
+      1, 1, ScalingInterpolation::sharp, &data);
+
+  FBSurface::Attributes& attr = _shadeSurface->attributes();
+
+  attr.blending = true;
+  attr.blendalpha = 25; // darken background dialogs by 25%
+  _shadeSurface->applyAttributes();
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -223,7 +235,7 @@ void Dialog::redraw(bool force)
   // Draw this dialog
   setPosition();
   drawDialog();
-  // full rendering is caused in  dialog container
+  // full rendering is caused in dialog container
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -251,24 +263,7 @@ void Dialog::render()
   {
     cerr << "    shade " << typeid(*this).name() << endl;
 
-    if(_shadeSurface == nullptr)
+    _shadeSurface->setDstRect(_surface->dstRect());
-    {
-      uInt32 data = 0xff000000;
-
-      _shadeSurface = instance().frameBuffer().allocateSurface(
-        1, 1, ScalingInterpolation::sharp, &data);
-
-      FBSurface::Attributes& attr = _shadeSurface->attributes();
-
-      attr.blending = true;
-      attr.blendalpha = 25; // darken background dialogs by 25%
-      _shadeSurface->applyAttributes();
-    }
-
-    const Common::Rect& rect = _surface->dstRect();
-    _shadeSurface->setDstPos(rect.x(), rect.y());
-    _shadeSurface->setDstSize(rect.w(), rect.h());
-
     _shadeSurface->render();
   }
 }

src/libretro/FBSurfaceLIBRETRO.hxx

@@ -44,8 +44,11 @@ class FBSurfaceLIBRETRO : public FBSurface
     const Common::Rect& dstRect() const override { return myDstGUIR; }
     void setSrcPos(uInt32 x, uInt32 y) override { }
     void setSrcSize(uInt32 w, uInt32 h) override { }
+    void setSrcRect(const Common::Rect& r) override { }
     void setDstPos(uInt32 x, uInt32 y) override { }
     void setDstSize(uInt32 w, uInt32 h) override { }
+    void setDstRect(const Common::Rect& r) override { }
+
     void setVisible(bool visible) override { }
 
     void translateCoords(Int32& x, Int32& y) const override { }