7ee7de1b92
And removed the rc file copying stuff from CMakeLists.txt. I wonder if this fixes the msbuild generators in cmake, so let's find out...
2018-05-02 23:04:43 -04:00
4432e39a44
And the color dialog. All done! Now we just need to clean up and remove the kludge.
2018-05-02 21:13:35 -04:00
e3e88c7a6a
And migrated the font dialog.
2018-05-02 20:57:50 -04:00
3522ec02b3
Fixed out.
2018-05-02 20:24:30 -04:00
a4cb17820c
Forgot a fix (thanks to two people on Telegram)
2018-05-02 20:21:51 -04:00
b975cfb83e
Fixes and TODOs in rc2bin. Going to manually adjust out instead of regenerating it, though.
2018-05-02 20:20:06 -04:00
c6979fa738
Removed rcTabPageDIalog from the resources. Also removed CRs from the out file. Need to fix that generator...
2018-05-02 20:17:08 -04:00
e11196304f
Since out32 and out64 are identical, deduplicate them. Now we can move its contents elsewhere.
2018-05-02 10:00:44 -04:00
88882592ac
Fixed compiler errors and generated the output.
2018-05-02 09:59:29 -04:00
10de22f9ac
Added a program to dump resources to C structs.
2018-05-02 09:56:06 -04:00
17ec9562ea
Cleanup of previous merge, including TODOs and massive infodumps.
2018-04-30 21:55:54 -04:00
2be8fd3eb3
Fixes to compile on windows with msys2
...
msys2 seems to be unsure of it's IDWriteTypography definition and
disables it by default. This overrides the disabling (The
IDWriteTypography definition looks OK to me, and seems to work
fine).
This commit also adds in a canary to detect compilers that have a non-16bit
wchar_t on windows (eg a gcc focused on porting unix code rather
than compiling windows code).
2018-05-01 12:59:26 +12:00
5cc85c2609
More ifxes.
2018-04-19 20:33:20 -04:00
e61f7fb0cb
Fix uiprivTimer::f: it should return an int
2018-04-19 21:03:49 +02:00
83b04cda47
And added documentation nits and TODOs to the uiTimer() code.
2018-04-18 21:09:24 -04:00
cac4cd9e81
Cleaned up stylistic nits and common branch naming issues on the new uiTimer() code. Also switched the Windows code to use a simple struct instead of the class (and with a uipriv name).
2018-04-18 21:04:12 -04:00
85a4c6d35d
Merge pull request #277 from cody271/timer
...
Adds a function uiTimer() that runs code on the main loop at certain intervals.
Original comment: Add Timer API
2018-04-18 20:52:59 -04:00
52dc39a553
Decided to keep attrstr.h for now; removed extern "C" hack from attrstr.hpp on Windows and moved it into attrstr.h. Let's merge back.
2018-04-18 00:54:24 -04:00
d99549ec18
uiTimer() Use TimerHandler pointers directly as Windows timer IDs
2018-04-16 17:28:13 -07:00
c9d11a85cc
uiTimer() Refactor TimerHandler for Windows timer IDs
2018-04-16 17:28:13 -07:00
4e6adca08c
uiTimer() Ensure Windows timer IDs are unique
2018-04-16 17:28:13 -07:00
b1210165a0
Implement uiTimer() for Windows
2018-04-16 17:28:13 -07:00
27b8ce1db3
Add uiTimer() API and example
2018-04-16 17:28:12 -07:00
fcc26ab9a9
Fixed a serious bug in windows/utf16.cpp that went unnoticed for this long: we wanted utf16UTF8Count(), not utf16RuneCount(), in toUTF8(); any non-ASCII text had the wrong number of bytes, and thus random heap corruption. The string "鎿嶄綔鎴愬姛瀹屾垚銆" (taken from the completely unrelated #337 ) and the Set Button Text button was enough to trigger this.
2018-04-15 23:10:11 -04:00
c3992cc647
uipriv-ized utf.c.
2018-04-15 23:08:57 -04:00
8e2004cf67
struct graphemes -> uiprivGraphemes. Also deleted OLD_uipriv.h now that that one is settled.
2018-04-15 22:43:14 -04:00
01d6422664
Added uipriv prefixes to the matrix functions.
2018-04-15 22:39:34 -04:00
24a4b0997c
fromScancode() -> uiprivFromScancode().
2018-04-15 22:31:17 -04:00
0dddf4a490
clickCounter -> uiprivClickCounter.
2018-04-15 22:26:51 -04:00
f5be05f143
shouldQuit() -> uiprivShouldQuit().
2018-04-15 21:54:46 -04:00
f93973d3cb
Migrated implbug() and userbug() to uipriv forms.
2018-04-15 21:46:08 -04:00
c6bb463692
uiAlloc() et al -> uiprivAlloc() et al, Windows code.
2018-04-15 18:12:58 -04:00
4a57b15d09
Renamed the common options variable to uiprivOptions.
2018-04-15 15:49:45 -04:00
93f0eea140
Likewise codified uiprivStricmp(). Honestly this will probably do for the Windows code for now...
2018-03-17 23:22:17 -04:00
8709838a8f
Added a uiFreeFontButtonFont() function to free resources allocated by uiFontButtonFont(), implemented it on Windows, and integrated it into the drawtext example. I'm going to continue chipping away at the Windows code for a bit longer, so I'll add this to the other platforms later.
2018-03-17 23:07:40 -04:00
78e0684435
Cleaned up memory management in windows attrstr.cpp; also got rid of the logHRESULT(HELP) I was using in case DirectWrite doesn't return NULL+S_OK on a nonexistent drawing effect (thankfully it does).
2018-03-17 21:26:34 -04:00
fa293717af
Removed the NumLines and LineByteRange functions for now; I'll count them under extents.
2018-03-17 21:05:05 -04:00
d358e87583
Moved the old metrics attrstr code out of the way.
2018-03-17 21:00:11 -04:00
45d11962b1
Turns out there was only one real runtime bug (a bad castee). It works! Now to clean up.
2018-03-17 16:10:11 -04:00
a5bbc83359
Fixed build errors. Now to test.
2018-03-17 15:49:00 -04:00
2f02836181
Fixed attrstr.cpp. Wow, that unordered_map custom hash and equal_to actually compiles!
2018-03-17 15:29:06 -04:00
51952b4599
And fixed the CMakeLists.txt. Now to build.
2018-03-17 14:50:10 -04:00
cdaf49ec30
And quick and dirty migration of fontdialog.cpp back. Okay, after fixing the CMakeLists.txt, let's see how bad this is.
2018-03-17 14:47:20 -04:00
e08460adc3
Cleanup from the previous commit.
2018-03-17 14:45:45 -04:00
8352cd72b8
"Migrated" dwrite.cpp back. Not much to say here; it'll do for now.
2018-03-17 14:44:38 -04:00
1d1b6c3162
Migrated fontbutton.cpp back.
2018-03-16 20:06:23 -04:00
1b1d609c88
More migrations of attrstr.cpp and drawtext.cpp. My this is a mess :D
2018-03-14 21:08:19 -04:00
5314295e4c
Started migrating drawtext.cpp. This is a bigger mess than I was hoping for...
2018-03-13 22:56:30 -04:00
5282951681
Oops, self -> this.
2018-03-13 22:06:33 -04:00
f25b8dce37
Finished migrating attrstr.cpp.
2018-03-13 22:01:15 -04:00
Pietro Gagliardi
Ben Campbell
Andrea Parodi
Pietro Gagliardi
cody271