From d85d74e615818ba2abf71dd668b0581c077a1575 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 7 Nov 2015 18:04:03 +0100
Subject: [PATCH] Use AdditiveLayer for the hit fader

---
 apps/openmw/mwgui/screenfader.cpp          | 4 ++--
 apps/openmw/mwgui/screenfader.hpp          | 2 +-
 apps/openmw/mwgui/windowmanagerimp.cpp     | 2 +-
 files/mygui/CMakeLists.txt                 | 1 +
 files/mygui/openmw_layers.xml              | 1 +
 files/mygui/openmw_screen_fader_hit.layout | 7 +++++++
 6 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 files/mygui/openmw_screen_fader_hit.layout

diff --git a/apps/openmw/mwgui/screenfader.cpp b/apps/openmw/mwgui/screenfader.cpp
index 473776a82..c44bcc3f1 100644
--- a/apps/openmw/mwgui/screenfader.cpp
+++ b/apps/openmw/mwgui/screenfader.cpp
@@ -66,8 +66,8 @@ namespace MWGui
         mFader->notifyOperationFinished();
     }
 
-    ScreenFader::ScreenFader(const std::string & texturePath)
-        : WindowBase("openmw_screen_fader.layout")
+    ScreenFader::ScreenFader(const std::string & texturePath, const std::string& layout)
+        : WindowBase(layout)
         , mCurrentAlpha(0.f)
         , mFactor(1.f)
         , mRepeat(false)
diff --git a/apps/openmw/mwgui/screenfader.hpp b/apps/openmw/mwgui/screenfader.hpp
index 402554555..d25f5fdc4 100644
--- a/apps/openmw/mwgui/screenfader.hpp
+++ b/apps/openmw/mwgui/screenfader.hpp
@@ -36,7 +36,7 @@ namespace MWGui
     class ScreenFader : public WindowBase
     {
     public:
-        ScreenFader(const std::string & texturePath);
+        ScreenFader(const std::string & texturePath, const std::string& layout = "openmw_screen_fader.layout");
 
         void setTexture(const std::string & texturePath);
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 3fe786ab2..bf65377f6 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -329,7 +329,7 @@ namespace MWGui
         // TODO: check if non-BM versions actually use player_hit_01.dds
         if(!mResourceSystem->getVFS()->exists(hitFaderTexture))
             hitFaderTexture = "textures\\player_hit_01.dds";
-        mHitFader = new ScreenFader(hitFaderTexture);
+        mHitFader = new ScreenFader(hitFaderTexture, "openmw_screen_fader_hit.layout");
         mScreenFader = new ScreenFader("black");
 
         mDebugWindow = new DebugWindow();
diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
index dc9e8ea84..7494d3ba2 100644
--- a/files/mygui/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -80,6 +80,7 @@ set(MYGUI_FILES
     openmw_savegame_dialog.layout
     openmw_recharge_dialog.layout
     openmw_screen_fader.layout
+    openmw_screen_fader_hit.layout
     openmw_edit_note.layout
     openmw_debug_window.layout
     openmw_debug_window.skin.xml
diff --git a/files/mygui/openmw_layers.xml b/files/mygui/openmw_layers.xml
index 7b2955bbd..c8684c858 100644
--- a/files/mygui/openmw_layers.xml
+++ b/files/mygui/openmw_layers.xml
@@ -2,6 +2,7 @@
 
 <MyGUI type="Layer" version="1.0">
     <Layer name="Overlay" overlapped="false" pick="false"/>
+    <Layer name="AdditiveOverlay" type="AdditiveLayer" pick="false"/>
     <Layer name="HUD" overlapped="false" pick="true"/>
     <Layer name="Menu" overlapped="false" pick="false"/>
     <Layer name="Windows" overlapped="true" pick="true"/>
diff --git a/files/mygui/openmw_screen_fader_hit.layout b/files/mygui/openmw_screen_fader_hit.layout
new file mode 100644
index 000000000..7e60f0ff5
--- /dev/null
+++ b/files/mygui/openmw_screen_fader_hit.layout
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Layout">
+    <Widget type="ImageBox" skin="ImageBox" layer="AdditiveOverlay" position="0 0 300 200" name="_Main" align="Stretch">
+        <Property key="ImageTexture" value="black"/>
+    </Widget>
+</MyGUI>