Merge pull request #1114 from 1vanK/master

Editor: fix sharp edges, when UI opacity == 1.0

bin/Data/Textures/OldUI.xml

@@ -1,5 +0,0 @@
-<texture>
-    <mipmap enable="false" />
-    <quality low="0" />
-</texture>
-

bin/Data/UI/DefaultStyle.xml

@@ -1,6 +1,7 @@
 <elements>
     <element type="BorderImage" >
         <attribute name="Texture" value="Texture2D;Textures/UI.png" />
+        <attribute name="Blend Mode" value="alpha" />
     </element>
     <element type="Button" style="BorderImage">
         <attribute name="Image Rect" value="16 0 32 16" />

bin/Data/UI/OldStyle.xml

@@ -1,259 +0,0 @@
-<elements>
-    <element type="BorderImage" >
-        <attribute name="Texture" value="Texture2D;Textures/OldUI.png" />
-    </element>
-    <element type="Button" style="BorderImage">
-        <attribute name="Size" value="16 16" />
-        <attribute name="Image Rect" value="16 0 32 16" />
-        <attribute name="Border" value="4 4 4 4" />
-        <attribute name="Pressed Image Offset" value="16 0" />
-        <attribute name="Hover Image Offset" value="0 16" />
-        <attribute name="Pressed Child Offset" value="-1 1" />
-    </element>
-    <element type="CheckBox" style="BorderImage">
-        <attribute name="Min Size" value="16 16" />
-        <attribute name="Max Size" value="16 16" />
-        <attribute name="Image Rect" value="64 0 80 16" />
-        <attribute name="Border" value="4 4 4 4" />
-        <attribute name="Checked Image Offset" value="16 0" />
-        <attribute name="Hover Image Offset" value="0 16" />
-    </element>
-    <element type="CloseButton" style="Button" auto="false">    <!-- non-auto style is shown explicitly in the Editor's style drop down list for user selection -->
-        <attribute name="Min Size" value="16 16" />
-        <attribute name="Max Size" value="16 16" />
-        <attribute name="Image Rect" value="128 0 144 16" />
-    </element>
-    <element type="Cursor">
-        <attribute name="Shapes">
-            <variant type="Int" value="8" />
-            <variant type="String" value="Normal" />
-            <variant type="ResourceRef" value="Image;Textures/OldUI.png" />
-            <variant type="IntRect" value="0 0 12 24" />
-            <variant type="IntVector2" value="0 0" />
-            <variant type="String" value="ResizeVertical" />
-            <variant type="ResourceRef" value="Image;Textures/OldUI.png" />
-            <variant type="IntRect" value="0 64 20 84" />
-            <variant type="IntVector2" value="9 9" />
-            <variant type="String" value="ResizeDiagonalTopRight" />
-            <variant type="ResourceRef" value="Image;Textures/OldUI.png" />
-            <variant type="IntRect" value="20 64 40 84" />
-            <variant type="IntVector2" value="9 9" />
-            <variant type="String" value="ResizeHorizontal" />
-            <variant type="ResourceRef" value="Image;Textures/OldUI.png" />
-            <variant type="IntRect" value="40 64 60 84" />
-            <variant type="IntVector2" value="9 9" />
-            <variant type="String" value="ResizeDiagonalTopLeft" />
-            <variant type="ResourceRef" value="Image;Textures/OldUI.png" />
-            <variant type="IntRect" value="60 64 80 84" />
-            <variant type="IntVector2" value="9 9" />
-            <variant type="String" value="RejectDrop" />
-            <variant type="ResourceRef" value="Image;Textures/OldUI.png" />
-            <variant type="IntRect" value="80 64 100 84" />
-            <variant type="IntVector2" value="9 9" />
-            <variant type="String" value="AcceptDrop" />
-            <variant type="ResourceRef" value="Image;Textures/OldUI.png" />
-            <variant type="IntRect" value="100 64 128 90" />
-            <variant type="IntVector2" value="0 0" />
-            <variant type="String" value="Busy" />
-            <variant type="ResourceRef" value="Image;Textures/OldUI.png" />
-            <variant type="IntRect" value="128 64 148 85" />
-            <variant type="IntVector2" value="9 9" />
-        </attribute>
-    </element>
-    <element type="DropDownList" style="BorderImage">
-        <attribute name="Image Rect" value="16 0 32 16" />
-        <attribute name="Border" value="4 4 4 4" />
-        <attribute name="Pressed Image Offset" value="16 0" />
-        <attribute name="Hover Image Offset" value="0 16" />
-        <attribute name="Pressed Child Offset" value="-1 1" />
-        <attribute name="Layout Mode" value="Horizontal" />
-        <attribute name="Layout Border" value="4 1 4 1" />
-        <element internal="true">
-            <element type="Text" internal="true" />
-        </element>
-        <element type="Window" internal="true" popup="true">
-            <attribute name="Layout Border" value="2 2 2 2" />
-            <element type="ListView" internal="true">
-                <attribute name="Highlight Mode" value="Always" />
-                <element type="BorderImage" internal="true">    <!-- Override scroll panel attributes from default ListView -->
-                    <attribute name="Image Rect" value="96 0 112 16" />
-                    <attribute name="Border" value="2 2 2 2" />
-                </element>
-            </element>
-        </element>
-    </element>
-    <element type="LineEdit" style="BorderImage">
-        <attribute name="Image Rect" value="112 0 128 16" />
-        <attribute name="Border" value="2 2 2 2" />
-        <attribute name="Clip Border" value="1 1 1 1" />
-        <attribute name="Hover Image Offset" value="0 16" />    <!-- Background color of the hover image IS the hover color of LineEdit -->
-        <element type="Text" internal="true">
-            <attribute name="Selection Color" value="0.7 0.7 0.7 1" />
-        </element>
-        <element type="BorderImage" internal="true">
-            <attribute name="Size" value="4 16" />
-            <attribute name="Priority" value="1" />
-            <attribute name="Image Rect" value="12 0 16 16" />
-        </element>
-    </element>
-    <element type="ListView" style="ScrollView" />  <!-- Shortcut to copy all the styles from ScrollView -->
-    <element type="ListViewHierarchyOverlay" style="BorderImage">
-        <attribute name="Min Size" value="16 16" />
-        <attribute name="Max Size" value="16 16" />
-        <attribute name="Image Rect" value="160 0 176 16" />
-        <attribute name="Checked Image Offset" value="16 0" />
-        <attribute name="Hover Image Offset" value="0 16" />
-    </element>
-    <element type="Menu" style="BorderImage">
-        <attribute name="Image Rect" value="96 0 112 16" />
-        <attribute name="Border" value="2 2 2 2" />
-        <attribute name="Pressed Image Offset" value="16 0" />
-        <attribute name="Hover Image Offset" value="0 16" />
-    </element>
-    <element type="ScrollBar">
-        <attribute name="Left Image Rect" value="32 32 48 48" />
-        <attribute name="Up Image Rect" value="0 32 16 48" />
-        <attribute name="Right Image Rect" value="48 32 64 48" />
-        <attribute name="Down Image Rect" value="16 32 32 48" />
-        <element type="Button" internal="true">
-            <attribute name="Size" value="12 12" />
-            <attribute name="Border" value="3 3 3 3" />
-            <attribute name="Pressed Image Offset" value="64 0" />
-            <attribute name="Hover Image Offset" value="0 16" />
-        </element>
-        <element type="Slider" internal="true">
-            <attribute name="Size" value="12 12" />
-            <attribute name="Image Rect" value="112 0 128 16" />
-            <attribute name="Border" value="3 3 3 3" />
-            <element type="BorderImage" internal="true">
-                <attribute name="Image Rect" value="48 0 64 16" />
-                <attribute name="Border" value="4 4 4 4" />
-                <attribute name="Hover Image Offset" value="0 16" />
-            </element>
-        </element>
-        <element type="Button" internal="true">
-            <attribute name="Size" value="12 12" />
-            <attribute name="Border" value="3 3 3 3" />
-            <attribute name="Pressed Image Offset" value="64 0" />
-            <attribute name="Hover Image Offset" value="0 16" />
-        </element>
-    </element>
-    <element type="ScrollView">
-        <element type="ScrollBar" internal="true">
-            <attribute name="Size" value="0 12" />
-        </element>
-        <element type="ScrollBar" internal="true">
-            <attribute name="Size" value="12 0" />
-        </element>
-        <element type="BorderImage" internal="true">
-            <attribute name="Image Rect" value="112 0 128 16" />
-            <attribute name="Border" value="2 2 2 2" />
-            <attribute name="Clip Border" value="1 1 1 1" />
-        </element>
-    </element>
-    <element type="Slider" style="BorderImage">
-        <attribute name="Size" value="12 12" />
-        <attribute name="Image Rect" value="112 0 128 16" />
-        <attribute name="Border" value="3 3 3 3" />
-        <element type="BorderImage" internal="true">
-            <attribute name="Image Rect" value="48 0 64 16" />
-            <attribute name="Border" value="4 4 4 4" />
-            <attribute name="Hover Image Offset" value="0 16" />
-        </element>
-    </element>
-    <element type="Window" style="BorderImage">
-        <attribute name="Image Rect" value="48 0 64 16" />
-        <attribute name="Border" value="3 3 3 3" />
-        <attribute name="Resize Border" value="8 8 8 8" />
-    </element>
-    <element type="Text">
-        <attribute name="Font" value="Font;Fonts/Anonymous Pro.ttf" />
-        <attribute name="Font Size" value="11" />
-    </element>
-    <element type="DebugHudText" style="Text" auto="false" />
-    <element type="ConsoleBackground" auto="false">
-        <attribute name="Top Left Color" value="0 0.25 0 0.75" />
-        <attribute name="Top Right Color" value="0 0.25 0 0.75" />
-        <attribute name="Bottom Left Color" value="0.25 0.75 0.25 0.75" />
-        <attribute name="Bottom Right Color" value="0.25 0.75 0.25 0.75" />
-        <attribute name="Layout Border" value="4 4 4 4" />
-    </element>
-    <element type="ConsoleText" style="Text" auto="false" />
-    <element type="ConsoleHighlightedText" style="Text" auto="false">
-        <attribute name="Color" value="0.75 0 0 1" />
-    </element>
-    <element type="ConsoleLineEdit" style="LineEdit" auto="false">
-        <attribute name="Min Size" value="0 17" />
-        <attribute name="Max Size" value="2147483647 17" />
-        <attribute name="Top Left Color" value="0 0 0 0.5" />
-        <attribute name="Top Right Color" value="0 0 0 0.5" />
-        <attribute name="Bottom Left Color" value="0 0 0 0.5" />
-        <attribute name="Bottom Right Color" value="0 0 0 0.5" />
-        <element type="Text" internal="true" style="none">
-            <attribute name="Selection Color" value="0 0.5 0 0.75" />
-        </element>
-    </element>
-    <element type="FileSelector" style="Window" auto="false">
-        <attribute name="Size" value="400 300" />
-        <attribute name="Is Movable" value="true" />
-        <attribute name="Is Resizable" value="true" />
-        <attribute name="Resize Border" value="6 6 6 6" />
-        <attribute name="Layout Mode" value="vertical" />
-        <attribute name="Layout Spacing" value="4" />
-        <attribute name="Layout Border" value="6 6 6 6" />
-        <attribute name="Modal Shade Color" value="0.45 0.70 0.45 0.05" />
-        <attribute name="Modal Frame Color" value="0.45 0.70 0.45" />
-        <attribute name="Modal Frame Size" value="2 2" />
-    </element>
-    <element type="FileSelectorButton" style="Button" auto="false">
-        <attribute name="Min Size" value="80 22" />
-        <attribute name="Max Size" value="80 22" />
-    </element>
-    <element type="FileSelectorButtonText" style="Text" auto="false" />
-    <element type="FileSelectorListView" style="ListView" auto="false" />
-    <element type="FileSelectorLineEdit" style="LineEdit" auto="false">
-        <attribute name="Min Size" value="0 17" />
-        <attribute name="Max Size" value="2147483647 17" />
-    </element>
-    <element type="FileSelectorFilterList" style="DropDownList" auto="false">
-        <attribute name="Min Size" value="64 18" />
-        <attribute name="Max Size" value="64 18" />
-        <attribute name="Resize Popup" value="true" />
-    </element>
-    <element type="FileSelectorFilterText" style="Text" auto="false">
-        <attribute name="Is Enabled" value="true" />
-        <attribute name="Selection Color" value="0.7 0.7 0.7 1" />
-        <attribute name="Hover Color" value="0.45 0.7 0.45 1" />
-    </element>
-    <element type="FileSelectorLayout" auto="false">
-        <attribute name="Layout Spacing" value="4" />
-        <attribute name="Min Size" value="0 17" />
-        <attribute name="Max Size" value="2147483647 17" />
-    </element>
-    <element type="FileSelectorListText" style="Text" auto="false">
-        <attribute name="Hover Color" value="0.45 0.7 0.45 1" />
-        <attribute name="Selection Color" value="0.7 0.7 0.7 1" />
-    </element>
-    <element type="FileSelectorTitleText" style="Text" auto="false" />
-    <element type="EditorDivider" style="BorderImage" auto="false">
-        <attribute name="Image Rect" value="144 32 160 43" />
-        <attribute name="Border" value="2 2 2 2" />
-        <attribute name="Min Size" value="0 11" />
-        <attribute name="Max Size" value="2147483647 11" />
-    </element>
-    <element type="EditorMenuBar" style="BorderImage" auto="false">
-        <attribute name="Image Rect" value="96 0 112 16" />
-        <attribute name="Border" value="2 2 2 2" />
-    </element>
-    <element type="EditorMenuText" style="Text" auto="false" />
-    <element type="EditorAttributeText" auto="false">
-        <attribute name="Font" value="Font;Fonts/Anonymous Pro.ttf" />
-        <attribute name="Font Size" value="9" />
-    </element>
-    <element type="EditorEnumAttributeText" style="EditorAttributeText" auto="false">
-        <attribute name="Is Enabled" value="true" />
-        <attribute name="Selection Color" value="0.7 0.7 0.7 1" />
-        <attribute name="Hover Color" value="0.45 0.7 0.45 1" />
-    </element>
-    <element type="EditorAttributeEdit" style="LineEdit" auto="false" />
-</elements>