Updated styles + Template fix

hugoam · May 4, 2015 · 7435e09 · 7435e09
1 parent b3c658e
commit 7435e09
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/data/interface/styles/blendish.yml b/data/interface/styles/blendish.yml
@@ -114,6 +114,9 @@ TypeIn :
 Header : 
     background_colour : 0.447,0.447,0.447,1.0
 
+Dockbar :
+    background_colour : 0.447,0.447,0.447,1.0
+
 DockWindow :
     background_colour : 0.447,0.447,0.447,1.0 
 
@@ -130,7 +133,6 @@ WindowHeader :
     topdown_gradient : 15,-15
     text_colour : 1.0,1.0,1.0,1.0
     padding : 4.0,2.0,4.0,2.0
-    align : CENTER, CENTER
 
 WindowBody :
     padding : 10.0, 4.0, 4.0, 4.0

diff --git a/data/interface/styles/blendish_dark.yml b/data/interface/styles/blendish_dark.yml
@@ -33,7 +33,7 @@ Button :
         topdown_gradient : -15,15
 
 Toggle :
-    inherit_skin : Blendish
+    copy_skin : Blendish
     background_colour : 0.275,0.275,0.275,1.0
     text_colour : 1.0,1.0,1.0,1.0
 
@@ -117,7 +117,12 @@ WindowHeader :
     topdown_gradient : 15,-15
     text_colour : 1.0,1.0,1.0,1.0
     padding : 4.0,2.0,4.0,2.0
-    align : CENTER, CENTER
+
+Dockbar :
+    copy_skin : WindowHeader
+
+DockToggle :
+    copy_skin : Toggle
 
 WindowBody :
     padding : 10.0, 4.0, 4.0, 4.0

diff --git a/data/interface/styles/mygui.yml b/data/interface/styles/mygui.yml
@@ -61,7 +61,6 @@ TypeIn :
 
 Dropdown :
     inherit_skin : TypeIn
-    align : LEFT, CENTER
 
 DropdownToggle :
     inherit_skin : Clear

diff --git a/data/interface/styles/turbobadger.yml b/data/interface/styles/turbobadger.yml
@@ -22,22 +22,19 @@ DockWindow :
 WindowHeader :
     padding : 10.0,2.0,10.0,2.0
     image_skin : tbb/window_mover_overlay, 7, 7, 7, 7, 3
-    align : LEFT, CENTER
     tile : tbb/window_mover_bg_tile
 
 WindowFooter :
     flow : OVERLAY
     space : BOARD
-    pivot : FORWARD, REVERSE
-    align : LEFT, LEFT
 
 WindowSizerLeft :
     opacity : VOID
 
 WindowSizerRight :
     image : tbb/resizer
     align : RIGHT, RIGHT
-    space : SPACE
+    skin_align : RIGHT, RIGHT
 
 WindowBody :
     padding : 10.0,4.0,10.0,10.0

diff --git a/data/interface/uisprites/styleedit.png b/data/interface/uisprites/styleedit.png
diff --git a/src/Ui/Widget/mkInput.h b/src/Ui/Widget/mkInput.h
@@ -27,7 +27,7 @@ namespace mk
 	public:
 		Field(const string& label, const T_Val& value, std::function<void(T_Arg)> callback = nullptr, bool reverse = false)
 			: Sequence()
-			, mInput(this->template makeappend<typename Input<T_Val>>(value, callback))
+			, mInput(this->template makeappend<Input<T_Val>>(value, callback))
 			, mLabel(this->template makeappend<Label>(label))
 		{
 			UNUSED(reverse);

diff --git a/src/Ui/Widget/mkTypeIn.h b/src/Ui/Widget/mkTypeIn.h
@@ -2,8 +2,8 @@
 //  This software is provided 'as-is' under the zlib License, see the LICENSE.txt file.
 //  This notice and the license may not be removed or altered from any source distribution.
 
-#ifndef MK_WTYPEIN_H
-#define MK_WTYPEIN_H
+#ifndef MK_TYPEIN_H
+#define MK_TYPEIN_H
 
 /* mk */
 #include <Ui/mkUiForward.h>

diff --git a/src/Ui/mkUiLayout.cpp b/src/Ui/mkUiLayout.cpp
@@ -143,6 +143,7 @@ namespace mk
 
 		Page::cls().layout().d_space = FIT;
 
+		Dockbar::cls().layout().d_space = SPACE;
 		Dockbar::cls().layout().d_flow = FLOAT_DEPTH;
 		Dockbar::cls().layout().d_align = DimAlign(RIGHT, LEFT);
 
@@ -157,6 +158,8 @@ namespace mk
 
 		Dockbox::cls().rebaseSkins(DockWindow::cls());
 
+		DockToggle::cls();
+
 		ScrollArea::cls().layout().d_space = SPACE;
 		ScrollArea::cls().layout().d_flow = FLOAT_DEPTH;
 		ScrollArea::cls().layout().d_align = DimAlign(RIGHT, LEFT);