Mirrors_UI_SDK/GacUI
1
0
Fork 0
mirror of https://github.com/vczh-libraries/Release.git synced 2026-05-20 03:11:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update release

Browse Source
This commit is contained in:
Zihan Chen
2017-04-09 20:40:11 -07:00
parent 2765857ab1
commit 492e6de171
10 changed files with 982 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Import/GacUI.cpp
+799 -874
View File
File diff suppressed because it is too large Load Diff
Import/GacUI.h
+155 -106
View File
File diff suppressed because it is too large Load Diff
Import/GacUIReflection.cpp
+2 -2
View File
@@ -512,7 +512,6 @@ Type Declaration
BEGIN_INTERFACE_MEMBER_NOPROXY(INativeController)
CLASS_MEMBER_STATIC_EXTERNALMETHOD(GetCurrentController, NO_PARAMETER, INativeController*(*)(), vl::reflection::description::GetCurrentController)
CLASS_MEMBER_PROPERTY_READONLY_FAST(OSVersion)
CLASS_MEMBER_PROPERTY_READONLY_FAST(ExecutablePath)
CLASS_MEMBER_METHOD(ResourceService, NO_PARAMETER)
@@ -745,6 +744,7 @@ Type Declaration
END_INTERFACE_MEMBER(IGuiResourceManager)
BEGIN_INTERFACE_MEMBER_NOPROXY(IGuiGraphicsElement)
CLASS_MEMBER_PROPERTY_READONLY_FAST(OwnerComposition)
END_INTERFACE_MEMBER(IGuiGraphicsElement)
BEGIN_CLASS_MEMBER(GuiGraphicsComposition)
@@ -852,7 +852,6 @@ Type Declaration
CLASS_MEMBER_PROPERTY_EVENT_FAST(Bounds, BoundsChanged)
CLASS_MEMBER_PROPERTY_FAST(AlignmentToParent)
CLASS_MEMBER_METHOD(ClearAlignmentToParent, NO_PARAMETER)
CLASS_MEMBER_METHOD(IsAlignedToParent, NO_PARAMETER)
END_CLASS_MEMBER(GuiBoundsComposition)
@@ -2604,6 +2603,7 @@ Type Declaration
CLASS_MEMBER_BASE(GuiScrollContainer::IStyleProvider)
CLASS_MEMBER_PROPERTY_READONLY_FAST(BaselineDocument)
CLASS_MEMBER_PROPERTY_READONLY_FAST(CaretColor)
END_INTERFACE_MEMBER(GuiDocumentViewer::IStyleProvider)
BEGIN_CLASS_MEMBER(GuiDocumentLabel)
Import/GacUIReflection.h
+5
View File
@@ -1927,6 +1927,11 @@ Interface Proxy
{
INVOKEGET_INTERFACE_PROXY_NOPARAMS(GetBaselineDocument);
}
presentation::Color GetCaretColor()override
{
INVOKEGET_INTERFACE_PROXY_NOPARAMS(GetCaretColor);
}
END_INTERFACE_PROXY(presentation::controls::GuiDocumentViewer::IStyleProvider)
BEGIN_INTERFACE_PROXY_RAWPTR(presentation::controls::GuiDocumentLabel::IStyleController,
Import/GacUIWindows.cpp
-76
View File
@@ -1523,74 +1523,6 @@ WindowsController
return VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR, dwlConditionMask) != FALSE;
}
bool IsWindowsServer()
{
OSVERSIONINFOEXW osvi = { sizeof(osvi), 0, 0, 0, 0, {0}, 0, 0, 0, VER_NT_WORKSTATION };
DWORDLONG const dwlConditionMask = VerSetConditionMask( 0, VER_PRODUCT_TYPE, VER_EQUAL );
return !VerifyVersionInfoW(&osvi, VER_PRODUCT_TYPE, dwlConditionMask);
}
WString GetOSVersion()
{
const vint SystemCount = 5;
DWORD SystemVersions[SystemCount] =
{
_WIN32_WINNT_WIN2K,
_WIN32_WINNT_WINXP,
_WIN32_WINNT_VISTA,
_WIN32_WINNT_WIN7,
_WIN32_WINNT_WIN8
};
vint SystemMaxServerPacks[SystemCount] =
{
4,
3,
2,
1,
0,
};
const wchar_t* SystemClientNames[SystemCount] =
{
L"Windows 2000",
L"Windows XP",
L"Windows Vista",
L"Windows 7",
L"Windows 8",
};
const wchar_t* SystemServerNames[SystemCount] =
{
L"Windows Server 2003",
L"Windows Server 2003 R2",
L"Windows Server 2008",
L"Windows Server 2008 R2",
L"Windows Server 2012",
};
bool isWindowsServer = IsWindowsServer();
for(vint systemIndex = SystemCount-1; systemIndex >=0; systemIndex--)
{
DWORD systemVersion = SystemVersions[systemIndex];
vint maxSp = SystemMaxServerPacks[systemIndex];
for(vint sp = maxSp; sp>=0; sp--)
{
if(IsWindowsVersionEqualOrGreater(HIBYTE(systemVersion), LOBYTE(systemVersion), (WORD)sp))
{
WString systemName = isWindowsServer?SystemServerNames[systemIndex]:SystemClientNames[systemIndex];
if(sp==0)
{
return systemName+L";";
}
else
{
return systemName+L";SP"+itow(sp);
}
}
}
}
return L"Windows <Unknown Version>";
}
WString GetExecutablePath()
{
Array<wchar_t> buffer(65536);
@@ -9793,10 +9725,6 @@ GuiGDIElement
GuiGDIElement::GuiGDIElement()
{
}
GuiGDIElement::~GuiGDIElement()
{
}
}
namespace elements_windows_gdi
@@ -12816,10 +12744,6 @@ GuiDirect2DElement
GuiDirect2DElement::GuiDirect2DElement()
{
}
GuiDirect2DElement::~GuiDirect2DElement()
{
}
}
namespace elements_windows_d2d
Import/GacUIWindows.h
+18 -22
View File
@@ -140,8 +140,8 @@ namespace vl
{
friend class WinMetaFile;
protected:
vint FWidth;
vint FHeight;
vint FWidth;
vint FHeight;
WinProxyDC* FDC;
void Create(vint Width, vint Height);
@@ -157,8 +157,8 @@ namespace vl
void LoadFrom(WString FileName);
void SaveTo(WString FileName);
WinDC* GetWinDC();
vint GetWidth();
vint GetHeight();
vint GetWidth();
vint GetHeight();
};
class WinMetaFile : public Object
@@ -166,16 +166,16 @@ namespace vl
friend class WinMetaFileBuilder;
protected:
HENHMETAFILE FHandle;
vint FWidth;
vint FHeight;
vint FWidth;
vint FHeight;
public:
WinMetaFile(WString FileName);
WinMetaFile(WinMetaFileBuilder* Builder);
~WinMetaFile();
HENHMETAFILE GetHandle();
vint GetWidth();
vint GetHeight();
vint GetWidth();
vint GetHeight();
};
class WinBitmap : public Object
@@ -190,15 +190,15 @@ namespace vl
};
protected:
BitmapBits FBits;
vint FWidth;
vint FHeight;
vint FWidth;
vint FHeight;
WinImageDC* FDC;
HBITMAP FHandle;
BYTE** FScanLines;
bool FAlphaChannelBuilt;
vint GetBitsFromBB(BitmapBits BB);
vint GetLineBytes(vint Width, BitmapBits BB);
vint GetBitsFromBB(BitmapBits BB);
vint GetLineBytes(vint Width, BitmapBits BB);
void FillBitmapInfoHeader(vint Width, vint Height, BitmapBits Bits, BITMAPINFOHEADER* Header);
HBITMAP CreateDDB(vint Width, vint Height, BitmapBits Bits);
HBITMAP CreateDIB(vint Width, vint Height, BitmapBits Bits, BYTE**& ScanLines);
@@ -211,9 +211,9 @@ namespace vl
void SaveToFile(WString FileName);
WinDC* GetWinDC();
vint GetWidth();
vint GetHeight();
vint GetLineBytes();
vint GetWidth();
vint GetHeight();
vint GetLineBytes();
BYTE** GetScanLines();
HBITMAP GetBitmap();
BitmapBits GetBitmapBits();
@@ -237,7 +237,7 @@ namespace vl
class WinBrush : public Object
{
public:
typedef Ptr<WinBrush> Ptr;
typedef Ptr<WinBrush> Ptr;
protected:
HBRUSH FHandle;
unsigned char* FDIBMemory;
@@ -1118,14 +1118,12 @@ Raw API Rendering Element
/// <summary>
/// Defines an element for customized rendering using GDI.
/// </summary>
class GuiGDIElement : public Object, public IGuiGraphicsElement, public Description<GuiGDIElement>
class GuiGDIElement : public GuiElementBase<GuiGDIElement>
{
DEFINE_GUI_GRAPHICS_ELEMENT(GuiGDIElement, L"GDIElement")
protected:
GuiGDIElement();
public:
~GuiGDIElement();
/// <summary>Rendering event.</summary>
compositions::GuiGraphicsEvent<GuiGDIElementEventArgs> Rendering;
};
@@ -1874,14 +1872,12 @@ Raw API Rendering Element
/// <summary>
/// Defines an element for customized rendering using Direct2D.
/// </summary>
class GuiDirect2DElement : public Object, public IGuiGraphicsElement, public Description<GuiDirect2DElement>
class GuiDirect2DElement : public GuiElementBase<GuiDirect2DElement>
{
DEFINE_GUI_GRAPHICS_ELEMENT(GuiDirect2DElement, L"Direct2DElement")
protected:
GuiDirect2DElement();
public:
~GuiDirect2DElement();
/// <summary>Render target changed (before) event. Resources that binded to the render target can be released at this moment.</summary>
compositions::GuiGraphicsEvent<GuiDirect2DElementEventArgs> BeforeRenderTargetChanged;
/// <summary>Render target changed (after) event. Resources that binded to the render target can be recreated at this moment.</summary>
Tools/GacGen.exe
BIN
View File
Binary file not shown.
Tutorial/GacUI_ControlTemplate/BlackSkin/UI/Skin.xml
BIN
View File
Binary file not shown.
Tutorial/GacUI_ControlTemplate/BlackSkin/UI/Source/DemoPartialClasses.cpp
+3
View File
@@ -19162,6 +19162,9 @@ Class (::darkskin::DocumentViewerTemplateConstructor)
{
::vl::__vwsn::This(::vl::__vwsn::This(this)->self)->SetDefaultScrollSize(::vl::__vwsn::Parse<::vl::vint32_t>(::vl::WString(L"20", false)));
}
{
::vl::__vwsn::This(::vl::__vwsn::This(this)->self)->SetCaretColor(::vl::__vwsn::Parse<::vl::presentation::Color>(::vl::WString(L"#FFFFFF", false)));
}
{
::vl::__vwsn::This(::vl::__vwsn::This(this)->self)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren);
}
Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin
BIN
View File
Binary file not shown.