Pietro Gagliardi
|
dc98bc2c25
|
Avoid merge conflict in uipriv_darwin.h.
|
2018-05-06 20:01:54 -04:00 |
|
Pietro Gagliardi
|
7b570a4026
|
Merge branch 'master' into table
|
2018-05-05 09:15:08 -04:00 |
|
Pietro Gagliardi
|
6a4a3e1b4d
|
More TODOs.
|
2018-05-03 01:55:35 -04:00 |
|
Pietro Gagliardi
|
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 |
Pietro Gagliardi
|
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 |
|
Pietro Gagliardi
|
ab336e0e8b
|
Fixed uiImage redeclaration warnings on OS X.
|
2018-04-18 10:29:16 -04:00 |
|
Pietro Gagliardi
|
d441455112
|
Updated common uipriv names on OS X.
|
2018-04-18 10:06:43 -04:00 |
|
Pietro Gagliardi
|
ae2eea7975
|
Merge branch 'master' into table
Long-overdue sync.
|
2018-04-18 10:00:13 -04:00 |
cody271
|
f921dde9f6
|
uiTimer() Use 'uipriv' prefix convention
|
2018-04-16 17:48:33 -07:00 |
|
cody271
|
fa7466e7b4
|
uiTimer() Qualify Objective-C instance variables with 'self'
|
2018-04-16 17:45:30 -07:00 |
|
cody271
|
68e1223e4d
|
Fix TimerDelegate memory leak
|
2018-04-16 17:28:13 -07:00 |
|
cody271
|
5dbe20593d
|
Implement uiTimer() for GTK+ and OS X
|
2018-04-16 17:28:12 -07:00 |
|
cody271
|
27b8ce1db3
|
Add uiTimer() API and example
|
2018-04-16 17:28:12 -07:00 |
|
Pietro Gagliardi
|
8e2004cf67
|
struct graphemes -> uiprivGraphemes. Also deleted OLD_uipriv.h now that that one is settled.
|
2018-04-15 22:43:14 -04:00 |
|
Pietro Gagliardi
|
01d6422664
|
Added uipriv prefixes to the matrix functions.
|
2018-04-15 22:39:34 -04:00 |
|
Pietro Gagliardi
|
f5be05f143
|
shouldQuit() -> uiprivShouldQuit().
|
2018-04-15 21:54:46 -04:00 |
|
Pietro Gagliardi
|
f93973d3cb
|
Migrated implbug() and userbug() to uipriv forms.
|
2018-04-15 21:46:08 -04:00 |
|
Pietro Gagliardi
|
8ca32f098f
|
uiAlloc() et al -> uiprivAlloc() et al, OS X code.
|
2018-04-15 16:05:24 -04:00 |
|
Pietro Gagliardi
|
4a57b15d09
|
Renamed the common options variable to uiprivOptions.
|
2018-04-15 15:49:45 -04:00 |
|
Pietro Gagliardi
|
df03c09a9c
|
More TODOs.
|
2018-03-18 15:40:45 -04:00 |
|
Pietro Gagliardi
|
9aea7fa62e
|
Polished up the drawtext demo a bit (such as finally fixing that titlebar). Also more crash-related TODOs.
|
2018-03-18 11:24:09 -04:00 |
|
Pietro Gagliardi
|
bc895d6707
|
And added the necessary functions on OS X. Now to do some final cleanup before merging back in (at long last).
|
2018-03-17 23:55:33 -04:00 |
|
Pietro Gagliardi
|
fa293717af
|
Removed the NumLines and LineByteRange functions for now; I'll count them under extents.
|
2018-03-17 21:05:05 -04:00 |
|
Pietro Gagliardi
|
d358e87583
|
Moved the old metrics attrstr code out of the way.
|
2018-03-17 21:00:11 -04:00 |
|
Pietro Gagliardi
|
f25b8dce37
|
Finished migrating attrstr.cpp.
|
2018-03-13 22:01:15 -04:00 |
|
Pietro Gagliardi
|
12e97a1b29
|
Started migrating attrstr.cpp, using the same techniques as attrstr.m.
|
2018-03-13 18:43:32 -04:00 |
|
Pietro Gagliardi
|
bffe311afe
|
Switched to using Pango background color attributes. Unix code done for now.
|
2018-03-11 20:23:18 -04:00 |
|
Pietro Gagliardi
|
7dc5c6d940
|
Migrated attrstr.c back.
|
2018-03-11 17:36:22 -04:00 |
|
Pietro Gagliardi
|
acbe7c3149
|
Implemented uiAttributeTypeBackground for OS X 10.12 and newer using the attribute included with Core Text. Also laid out a non-block-based API for drawing backgrounds on older versions of OS X (not implemented here yet, however; that will require bringing back the old metrics code).
|
2018-03-11 03:30:02 -04:00 |
|
Pietro Gagliardi
|
6643a148e0
|
More TODOs.
|
2018-03-10 22:18:48 -05:00 |
|
Pietro Gagliardi
|
b15f88412b
|
Fixed the infinite loop: end is exclusive, and my code was correct in handling that, so <= (which i though was needed there because I thought the code wouldn't handle it) is wrong. Now for a segfault.
|
2018-03-10 22:04:07 -05:00 |
|
Pietro Gagliardi
|
4bb6a56c99
|
More warning fixes. Made private uiAttributeString functions const-correct to expose more potential issues later. Const-correctness and uiAttributeRetain() are going to be an issue...
|
2018-03-10 19:21:39 -05:00 |
|
Pietro Gagliardi
|
9194ba29fe
|
And fixed build errors. Now I'm sure there are warnings that are real bugs, so let's handle those next.
|
2018-03-10 19:02:10 -05:00 |
|
Pietro Gagliardi
|
c82197f408
|
And fixed other compile errors. Of course I forgot to add uiFontButton back in (I wanted to properly comment that first :/ ). Now for linker errors, which may result in some warning fixes along the way.
|
2018-03-09 18:01:23 -05:00 |
|
Pietro Gagliardi
|
82d3de7c31
|
More compiler error fixes. Oops, I forgot to finish attrstr.m!
|
2018-03-08 23:27:04 -05:00 |
|
Pietro Gagliardi
|
e9a62461c2
|
Started fixing compile errors. I forgot I renamed uiDrawFontDescriptor to uiFontDescriptor!
|
2018-03-08 23:04:45 -05:00 |
|
Pietro Gagliardi
|
5535c43bd8
|
And finished up drawtext.m for now.
|
2018-03-08 22:38:53 -05:00 |
|
Pietro Gagliardi
|
7451d455e5
|
Started a new drawtext.m with a different way to handle the empty-string crash problem.
|
2018-03-07 23:53:36 -05:00 |
|
Pietro Gagliardi
|
bf58601ff8
|
More TODOs.
|
2018-03-05 23:16:43 -05:00 |
|
Pietro Gagliardi
|
00749b07ac
|
And cleaned up all the font handling stuff in attrstr.m. A lot cleaner now! Not fully clean, but clean*er*, and probably more efficient, too...
|
2018-03-05 23:15:31 -05:00 |
|
Pietro Gagliardi
|
93c375fd94
|
Implemented -[uiprivCombinedFontAttr hash].
|
2018-03-05 08:59:45 -05:00 |
|
Pietro Gagliardi
|
9e57c78fb3
|
Started really refactoring attrstr.m by turning uiprivCombinedFontAttr into an actual attribute that CFAttributedString will manage itself; it will store uiAttributes (so we can use uiprivAttributeEqual() instead of duplicating its logic). Later, we will make it convert to CTFontRefs in place.
|
2018-03-04 23:57:18 -05:00 |
|
Pietro Gagliardi
|
49c3f77d46
|
Started cleaning up attrstr.m. This is gonna be fun...
|
2018-03-04 20:45:05 -05:00 |
|
Pietro Gagliardi
|
232b14ccde
|
Migrated attrstr.m. This file needs to be cleaned up...
|
2018-03-04 20:01:52 -05:00 |
|
Pietro Gagliardi
|
1fc9f137bc
|
Migrated fontbutton.m back.
|
2018-03-04 19:51:45 -05:00 |
|
Pietro Gagliardi
|
0b3176cead
|
Migrated the font matchng stuff on OS X.
|
2018-03-04 18:01:08 -05:00 |
|
Pietro Gagliardi
|
d8ad3300c9
|
Migrated aat.m back.
|
2018-03-04 15:53:46 -05:00 |
|
Pietro Gagliardi
|
36567cc522
|
Migrated OS X graphemes.m.
|
2018-03-04 15:48:45 -05:00 |
|
Pietro Gagliardi
|
7fd012418d
|
Migrated (and cleaned up) OS X opentype.m.
|
2018-03-04 15:09:27 -05:00 |
|
Pietro Gagliardi
|
036c7c12e6
|
Updated CONTRIBUTING.md and moved the old OS X draw text stuff out of the way.
|
2018-03-04 13:52:33 -05:00 |