interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added some TODOs and started the work necessary for the Windows text system migration... which is gonna hurt.

This commit is contained in:
Pietro Gagliardi 2017-01-17 23:25:26 -05:00
parent 5444f76bd3
commit f7121774e1
6 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/drawtests.c
View File

@ -4,6 +4,7 @@
// TODO // TODO
// - test multiple clips // - test multiple clips
// - test saving and restoring clips // - test saving and restoring clips
// - copy tests from https://github.com/Microsoft/WinObjC
struct drawtest { struct drawtest {
const char *name; const char *name;

4
windows/CMakeLists.txt
View File

@ -26,8 +26,8 @@ list(APPEND _LIBUI_SOURCES
windows/editablecombo.cpp windows/editablecombo.cpp
windows/entry.cpp windows/entry.cpp
windows/events.cpp windows/events.cpp
windows/fontbutton.cpp # windows/fontbutton.cpp
windows/fontdialog.cpp # windows/fontdialog.cpp
windows/form.cpp windows/form.cpp
windows/graphemes.cpp windows/graphemes.cpp
windows/grid.cpp windows/grid.cpp

0
windows/drawtext.cpp → windows/_old_drawtext.cpp
View File

6
windows/_uipriv_migrate.hpp
View File

@ -19,6 +19,7 @@ extern IDWriteFactory *dwfactory;
#endif #endif
extern HRESULT initDrawText(void); extern HRESULT initDrawText(void);
extern void uninitDrawText(void); extern void uninitDrawText(void);
#if 0 /* TODO */
#ifdef __cplusplus #ifdef __cplusplus
struct fontCollection { struct fontCollection {
IDWriteFontCollection *fonts; IDWriteFontCollection *fonts;
@ -30,8 +31,10 @@ extern WCHAR *fontCollectionFamilyName(fontCollection *fc, IDWriteFontFamily *fa
extern void fontCollectionFree(fontCollection *fc); extern void fontCollectionFree(fontCollection *fc);
extern WCHAR *fontCollectionCorrectString(fontCollection *fc, IDWriteLocalizedStrings *names); extern WCHAR *fontCollectionCorrectString(fontCollection *fc, IDWriteLocalizedStrings *names);
#endif #endif
#endif
// drawtext.cpp // drawtext.cpp
#if 0 /* TODO */
#ifdef __cplusplus #ifdef __cplusplus
extern uiDrawTextFont *mkTextFont(IDWriteFont *df, BOOL addRef, WCHAR *family, BOOL copyFamily, double size); extern uiDrawTextFont *mkTextFont(IDWriteFont *df, BOOL addRef, WCHAR *family, BOOL copyFamily, double size);
struct dwriteAttr { struct dwriteAttr {
@ -45,8 +48,10 @@ struct dwriteAttr {
extern void attrToDWriteAttr(struct dwriteAttr *attr); extern void attrToDWriteAttr(struct dwriteAttr *attr);
extern void dwriteAttrToAttr(struct dwriteAttr *attr); extern void dwriteAttrToAttr(struct dwriteAttr *attr);
#endif #endif
#endif
// fontdialog.cpp // fontdialog.cpp
#if 0 /* TODO */
#ifdef __cplusplus #ifdef __cplusplus
struct fontDialogParams { struct fontDialogParams {
IDWriteFont *font; IDWriteFont *font;
@ -59,3 +64,4 @@ extern void loadInitialFontDialogParams(struct fontDialogParams *params);
extern void destroyFontDialogParams(struct fontDialogParams *params); extern void destroyFontDialogParams(struct fontDialogParams *params);
extern WCHAR *fontDialogParamsToString(struct fontDialogParams *params); extern WCHAR *fontDialogParamsToString(struct fontDialogParams *params);
#endif #endif
#endif

1
windows/drawpath.cpp
View File

@ -66,6 +66,7 @@ void uiDrawPathNewFigure(uiDrawPath *p, double x, double y)
// That is to say, it's NOT THE SWEEP. // That is to say, it's NOT THE SWEEP.
// The sweep is defined by the start and end points and whether the arc is "large". // The sweep is defined by the start and end points and whether the arc is "large".
// As a result, this design does not allow for full circles or ellipses with a single arc; they have to be simulated with two. // As a result, this design does not allow for full circles or ellipses with a single arc; they have to be simulated with two.
// TODO https://github.com/Microsoft/WinObjC/blob/develop/Frameworks/CoreGraphics/CGPath.mm#L313
struct arc { struct arc {
double xCenter; double xCenter;

6
windows/dwrite.cpp
View File

@ -1,6 +1,6 @@
// 14 april 2016 // 14 april 2016
#include "uipriv_windows.hpp" #include "uipriv_windows.hpp"
// TODO really migrate? // TODO really migrate? (TODO what did I mean by this?)
IDWriteFactory *dwfactory = NULL; IDWriteFactory *dwfactory = NULL;
@ -17,6 +17,8 @@ void uninitDrawText(void)
dwfactory->Release(); dwfactory->Release();
} }
#if 0 /* TODO */
fontCollection *loadFontCollection(void) fontCollection *loadFontCollection(void)
{ {
fontCollection *fc; fontCollection *fc;
@ -86,3 +88,5 @@ void fontCollectionFree(fontCollection *fc)
fc->fonts->Release(); fc->fonts->Release();
uiFree(fc); uiFree(fc);
} }
#endif