Commit Graph

753 Commits

Author SHA1 Message Date
Pietro Gagliardi 8a0ca54e93 Fixed constraint issues in tablecolumn.m for text-containing columns. I guess that one constraint function needs to go... 2018-06-04 20:03:05 -04:00
Pietro Gagliardi 2cfbb0144e Fixed segfaults. Now to fix logic errors. (Technically one of the two changes here is a logic error too.) 2018-06-04 18:17:05 -04:00
Pietro Gagliardi 2b428d50f6 And fixed build errors. Now I just need to rewrite the tester and try this out... 2018-06-03 23:06:44 -04:00
Pietro Gagliardi 8fc4a9aaf5 Filled in the rest of tablecolumn.m: wrote the NSTableColumn subclasses and implemented the public functions. Let's build and see what breaks! 2018-06-03 22:37:36 -04:00
Pietro Gagliardi 6457e1668f Rewrote uiTableModelRowChanged() to properly update rows. We can do this now that we have the setup for row updates and reuse, but this is better than calling reloadData anyway (and reloadData doesn't update the row view, but we (almost) do, so...)... 2018-06-03 21:39:49 -04:00
Pietro Gagliardi 247d63be60 Added a table.h and simplified uiprivTableColumn into an abstract interface. 2018-06-03 20:55:08 -04:00
Pietro Gagliardi da2a4c1e36 Started building back the uiTable implementation. 2018-06-03 19:59:05 -04:00
Pietro Gagliardi 8ee5c61fe8 And added button columns. Now to start writing the rest of the uiTable glue. 2018-06-03 19:21:01 -04:00
Pietro Gagliardi b74b987fff Added progressbar columns. 2018-06-03 18:34:29 -04:00
Pietro Gagliardi c04f3d3fbe Adjusted tablecolumn.m to use the new data functions. 2018-06-03 17:39:02 -04:00
Pietro Gagliardi 9c519f1bfa Added checkboxes and consolidated all the columns with or without text. Progressbars and buttons will be separate object types. I do need to redo the data-passing method, and now that there's uiAttribute I can just model a better one off that. 2018-06-03 16:50:35 -04:00
Pietro Gagliardi d1b7d14a82 Added image columns. 2018-06-03 14:13:32 -04:00
Pietro Gagliardi 5d57666764 Started writing the new table column code on OS X. This new code will take full advantage of NSTableView features like the reuse cache. Right now we just have the boilerplate for text-only columns. 2018-06-03 13:28:42 -04:00
Niklas Mischkulnig 3e5f4b3674 Fix area setSize macOS 2018-06-01 15:45:55 +02:00
Pietro Gagliardi 7911ed0e81 Merge branch 'master' into table 2018-05-31 08:21:21 -04:00
Niklas Mischkulnig 1b4c898a0c Fix datetimepicker crash 2018-05-31 13:03:19 +02:00
Pietro Gagliardi 31090442be Merge branch 'master' into table 2018-05-13 18:05:50 -04:00
Pietro Gagliardi 02fc3e267e And fixed on OS X too. IIRC I handled it on Windows in a prior commit. 2018-05-13 18:04:57 -04:00
Pietro Gagliardi 9dad806693 Merge branch 'master' into table 2018-05-13 12:05:43 -04:00
Pietro Gagliardi ca1079f344 Cleaned up from the previous merge and added it to the README. 2018-05-13 12:05:09 -04:00
cody271 fd3b693ffe uiDateTimePicker Use more 'uipriv' on OS X 2018-05-12 21:40:47 -07:00
cody271 9aba97714d uiDateTimePicker Add comments 2018-05-12 21:35:07 -07:00
cody271 f3d0fee21a uiDateTimePicker Use 'uipriv' convention 2018-05-12 21:35:07 -07:00
cody271 edd4127f8e uiDateTimePicker Fix style consistency 2018-05-12 21:35:07 -07:00
cody271 0baf2d2eb6 uiDateTimePicker Keep libui constructors at the end of the file 2018-05-12 21:35:07 -07:00
cody271 cf671c1da5 uiDateTimePicker Fix NSDatePicker timezone handling 2018-05-12 21:35:07 -07:00
cody271 04ce39a941 Implement uiDateTimePickerTime() for OS X 2018-05-12 21:35:07 -07:00
cody271 bc14042935 Add uiDateTimePickerTime() APIs 2018-05-12 21:35:07 -07:00
Pietro Gagliardi 86798f72b1 Merge branch 'master' into table 2018-05-13 00:15:37 -04:00
Pietro Gagliardi 2768fef3ce Cleaned up old static-library stuff from CMakeLists.txt. 2018-05-12 23:59:43 -04:00
Pietro Gagliardi 5ac579df35 Fixed table.m to line up with the changes on master that have since been merged in. 2018-05-06 22:13:03 -04:00
Pietro Gagliardi 3b5ef559f5 Merge branch 'master' into table 2018-05-06 21:30:29 -04:00
Pietro Gagliardi 221e8731c0 Revert "Avoid merge conflict in uipriv_darwin.h."
Nope, this confused git further

This reverts commit dc98bc2c25.
2018-05-06 21:26:51 -04:00
Pietro Gagliardi dc98bc2c25 Avoid merge conflict in uipriv_darwin.h. 2018-05-06 20:01:54 -04:00
Pietro Gagliardi f1c4976fe0 Oh right, I forgot to remove the static library fuckery from the darwin CMakeLists.txt. NOW MERGING. 2018-05-06 19:34:58 -04:00
Pietro Gagliardi 98fe8736b5 ...draw.h has nothing, so more TODOs. Now for investigating each file in turn. 2018-05-05 22:14:29 -04:00
Pietro Gagliardi fdff9b2dbb Renamed future and undocumented names. Now for draw.h (and whatever other headers are left behind), and then we figure out what to do about other names (including specifically pinning a naming convention). 2018-05-05 22:02:25 -04:00
Pietro Gagliardi 3914451c34 Migrated newLabel(), imageImage(), doManualMove(), and doManualResize(). 2018-05-05 21:28:13 -04:00
Pietro Gagliardi 69922a0fb3 Migrated shared scrollview.m types and functions. 2018-05-05 21:21:44 -04:00
Pietro Gagliardi cc271ccc37 Migrated newContext(), freeContext(), and colorButtonInhibitSendAction(). 2018-05-05 20:28:00 -04:00
Pietro Gagliardi 323a8945eb Migrated sendAreaEvents() and the areaevents.m keycode functions. 2018-05-05 20:20:57 -04:00
Pietro Gagliardi b8fc9fa817 Migrated shared functions and types of autolayout.m. 2018-05-05 20:15:48 -04:00
Pietro Gagliardi eb28beff1b Migrated alloc.m functions. 2018-05-05 19:46:57 -04:00
Pietro Gagliardi 090c783147 Migrated functions from window.m. 2018-05-05 19:38:16 -04:00
Pietro Gagliardi 7b570a4026 Merge branch 'master' into table 2018-05-05 09:15:08 -04:00
Pietro Gagliardi 2f92f644b5 Migrated util.m and the new NSTextField functions. 2018-05-04 20:26:13 -04:00
Pietro Gagliardi 1381edfa6e Migrated main.m functions. Before we merge this back in I absoltuely must do something about main.m and menu.m, even if ethereal. 2018-05-04 19:50:02 -04:00
Pietro Gagliardi 60e71c7174 Migrated menu.m for now. Need to figure out what to do about ivars and methods and properties. Also still not happy with the property and autoreleasepool mess of main.m... 2018-05-03 23:20:12 -04:00
Pietro Gagliardi b8316c61dd Converted struct mapTable to uiprivMap first, since that typedef will be a dependency of later stuff. ALso I didn't realize whoever wrote that new menu code also completely rewrote map.m... Cleaned up style inconsistencies I found in both. Anyway I plan on getting rid of that menu code anyway, and I could just have something else for target-action instead of this depending on whatever happens with ARC... 2018-05-03 23:02:38 -04:00
Pietro Gagliardi 5a113e1e0b Renamed toNSString() and fromNSString() to uiprivToNSString() and uiprivFromNSString(), respectively. 2018-05-03 22:38:21 -04:00
Pietro Gagliardi 4fe74fbd56 Started OS X name migration by moving uipriv_darwin.h out of the way. 2018-05-03 22:28:02 -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
Pietro Gagliardi 243e210cbc Resolved some darwin/drawtext.m TODOs. 2017-11-04 11:52:33 -04:00