aboutsummaryrefslogtreecommitdiff
path: root/source/WindowsFormsApplication1/SkinEngine/WindowComposition.cs
diff options
context:
space:
mode:
authorMichael VanOverbeek <[email protected]>2016-07-25 12:57:52 -0400
committerGitHub <[email protected]>2016-07-25 12:57:52 -0400
commit46c1c31302f111a1f3ec23a70e6f3986a9aa2a27 (patch)
treef00af7ea3f6ad2641fb26fa1d310fd8b7179b39c /source/WindowsFormsApplication1/SkinEngine/WindowComposition.cs
parentaf48e774189596b8d7a058c564a7d6d75205ca03 (diff)
parent6fa16209519896de09949a27425dff00ebf2970a (diff)
downloadshiftos-c--46c1c31302f111a1f3ec23a70e6f3986a9aa2a27.tar.gz
shiftos-c--46c1c31302f111a1f3ec23a70e6f3986a9aa2a27.tar.bz2
shiftos-c--46c1c31302f111a1f3ec23a70e6f3986a9aa2a27.zip
Merge pull request #17 from MichaelTheShifter/shiftui_integration
Shiftui integration
Diffstat (limited to 'source/WindowsFormsApplication1/SkinEngine/WindowComposition.cs')
-rw-r--r--source/WindowsFormsApplication1/SkinEngine/WindowComposition.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/WindowsFormsApplication1/SkinEngine/WindowComposition.cs b/source/WindowsFormsApplication1/SkinEngine/WindowComposition.cs
index 18fe2d1..99fd813 100644
--- a/source/WindowsFormsApplication1/SkinEngine/WindowComposition.cs
+++ b/source/WindowsFormsApplication1/SkinEngine/WindowComposition.cs
@@ -5,7 +5,7 @@ using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
namespace ShiftOS
{
@@ -13,7 +13,7 @@ namespace ShiftOS
{
private static bool _CanClose = true;
public static bool ShuttingDown = false;
- public static bool SafeToAddControls = true;
+ public static bool SafeToAddWidgets = true;
public static bool CanClose
{
@@ -57,7 +57,7 @@ namespace ShiftOS
t.Start();
}
- public static void ScaleWidget(Control ctrl, int width, int height)
+ public static void ScaleWidget(Widget ctrl, int width, int height)
{
ctrl.Size = new Size(0, 0);
var t = new Timer();