Commit Graph

2101 Commits

Author SHA1 Message Date
Pietro Gagliardi 35b2b490bb Changed complain() for bugs in libui and control implementations to implbug(). 2016-04-21 16:29:34 -04:00
Pietro Gagliardi 3b4eeee7bb Whops, left some stuff over in events.cpp. Also added a comment. 2016-04-21 15:01:05 -04:00
Pietro Gagliardi a8e897c1ec Started rewriting ui_windows.h and uipriv_windows.h(pp). 2016-04-21 12:55:09 -04:00
Pietro Gagliardi 82b1b363f2 Quick fix in events.cpp. 2016-04-21 12:22:02 -04:00
Pietro Gagliardi 99aba5a3b8 Got rid of all the template cruft and other nonsense from events.cpp. 2016-04-21 12:20:37 -04:00
Pietro Gagliardi df190dc368 Templatized this. I feel dirty. 2016-04-21 11:22:34 -04:00
Pietro Gagliardi 1f6bbdc268 Removed uthash. All its (one) uses are now using C++ instead. 2016-04-20 22:15:24 -04:00
Pietro Gagliardi 87c2c4f3f7 "Moved" events.c to C++. 2016-04-20 22:10:04 -04:00
Pietro Gagliardi b9384c0e32 Quick fixes to the previous commit. 2016-04-20 20:21:57 -04:00
Pietro Gagliardi 6b7b5de743 Migrated alloc.c to C++. This is working already :v 2016-04-20 20:20:10 -04:00
Pietro Gagliardi 55116199ac Pruned, organized, and formatted winapi.hpp. 2016-04-20 19:51:30 -04:00
Pietro Gagliardi a7ff1e7c78 Moved the files that are already C++ out of the way so we can migrate them later and separate them from the already-migrated files. 2016-04-20 19:41:14 -04:00
Pietro Gagliardi 09c1a62a8e Moved most of the headers to C++. 2016-04-20 19:39:20 -04:00
Pietro Gagliardi 655e05463d Implemented the new font button stuff on Windows. 2016-04-20 14:17:55 -04:00
Pietro Gagliardi e6effa042d Implemented the new fontbutton routines on GTK+. 2016-04-20 13:59:59 -04:00
Pietro Gagliardi cfa1b6bf0a Added uiFontButtonFont() and uiFontButtonOnChanged(); implemented on OS X. 2016-04-20 13:40:54 -04:00
Pietro Gagliardi 275b80a6d9 More TODOs. 2016-04-20 12:37:04 -04:00
Pietro Gagliardi 9b1d75bec2 More TODOs and stale TODO elimination. 2016-04-20 02:52:46 -04:00
Pietro Gagliardi 8493bc3c5d Fixed the GTK+ SetColor() issues. It works! 2016-04-20 01:14:46 -04:00
Pietro Gagliardi 78772ca62d Fixed most compiler errors and warnings. 2016-04-19 23:58:36 -04:00
Pietro Gagliardi 6b6d6861c1 Wrote the SetColor() for GTK+. Now to test. 2016-04-19 23:52:44 -04:00
Pietro Gagliardi 721269b3eb Implemented colored text on OS X and Windows. 2016-04-19 18:45:16 -04:00
Pietro Gagliardi e786d664cb Implemented text layout SetColor on OS X. 2016-04-19 16:06:50 -04:00
Pietro Gagliardi 7a568f6bf4 Added the first text layout attribute: foreground color. Now to implement. 2016-04-19 15:38:24 -04:00
Pietro Gagliardi 6fdbd8d68f Implemented the chars-to-bytes algorithm on the GTK+ code. Now to finally add attributes to uiDrawTextLayout! 2016-04-19 14:57:15 -04:00
Pietro Gagliardi 5b74b2752e Decided to use character offsets instead of byte offsets for text layout attributes. This removes the shaky code from the OS X and Windows backends to compute a list of character offsets for byte offsets. The equivalent code for GTK+ to convert chars to bytes will be much more solid; it will be written next. 2016-04-19 14:39:33 -04:00
Pietro Gagliardi c2d165af94 Implemented the uiDrawTextFont direct from system font-making functions on other platforms. 2016-04-19 11:23:05 -04:00
Pietro Gagliardi a1d0e669c8 Added some helpers for actually returning a font from the font button on Windows. Similar helpers are needed on other platforms. 2016-04-18 19:18:29 -04:00
Pietro Gagliardi 861b5f22df Finished changing the Windows font dialog and uiFontButton to manipulate IDWriteFonts directly. 2016-04-18 17:14:33 -04:00
Pietro Gagliardi b19a8c9c46 Okay, I made a mistake: we want uiFontButton to return uiDrawFonts, not uiDrawFontDescriptors. Started the work to change the Windows one likewise. 2016-04-18 15:31:52 -04:00
Pietro Gagliardi ccfa3d41a3 More work on the initial font and showing styles. I have a feeling my current approach is a mistake. 2016-04-18 13:32:48 -04:00
Pietro Gagliardi 84fc5dafaa More TODOs. 2016-04-18 10:22:36 -04:00
Pietro Gagliardi 4d025172fe And brought the new font out of the font dialog and into the font button. We should be good now... 2016-04-18 01:12:25 -04:00
Pietro Gagliardi dcbbced23b Implemented loading of the font dialog font. Now to save it too. 2016-04-18 00:56:13 -04:00
Pietro Gagliardi 97aad9a039 Added support routines for migrating DirectWrite attributes. 2016-04-18 00:41:17 -04:00
Pietro Gagliardi 7cf8420682 Hooked the Windows font button and font dialog together at last. More TODOs. Now we just need to actually convert everything to DirectWrite and implement the label. 2016-04-17 22:09:18 -04:00
Pietro Gagliardi 40d673fb01 Implemented the correct behavior for the initial display of the size combobox of the font dialog. At this point we can move straight to manipulating the uiDrawFontDescriptors. 2016-04-17 21:11:55 -04:00
Pietro Gagliardi 0e75a6f950 Properly implemented the size combobox. We're so close! 2016-04-17 20:10:14 -04:00
Pietro Gagliardi 39ea7e269f Implemented nearest style matches when changing families. Wow we're actually almost done here! 2016-04-17 19:37:03 -04:00
Pietro Gagliardi 156fae7bbb Implemented events and type-to-select for the Style combobox. 2016-04-17 19:22:37 -04:00
Pietro Gagliardi aa6778acbe Implemented type-to-search in the font dialog. 2016-04-17 19:03:34 -04:00
Pietro Gagliardi edef521ded Quick TODO resolution. 2016-04-17 16:49:50 -04:00
Pietro Gagliardi d45fdb4a3d Migrated the font dialog from drawing its own sample text to having a D2D scratch control do it. 2016-04-17 13:06:45 -04:00
Pietro Gagliardi 3bb2a0ab21 Added a Direct2D scratch control that will be used by the font and color dialogs we will implement. 2016-04-17 11:53:24 -04:00
Pietro Gagliardi cc7675ab5a More font dialog work: split out all the combobox manipulation functions into their own function, made the current selection part of the structure, made the font families item data to the family combobox, and changed the font face string function to use the dedicated font face string method (thanks Windows 7 ChooseFont sample program). 2016-04-17 01:34:05 -04:00
Pietro Gagliardi 46db0b30ee Oh fixed the font dialog not showing all styles thing; stupid me forgot that a IDWriteFontFamily is also a IDWriteFontList. 2016-04-16 22:46:39 -04:00
Pietro Gagliardi 9a1367c0bc More font dialog work. Ugh if only I could just use the Windows 7 sample code one... 2016-04-16 22:15:19 -04:00
Pietro Gagliardi f3ae17793d Quick compilation fixes. I really don't know what I'm doing right now. 2016-04-16 19:25:21 -04:00
Pietro Gagliardi ecbdddb703 More sample work. Ugh this is a mess I should just use Direct2D after all. 2016-04-16 19:07:17 -04:00
Pietro Gagliardi 351fc59b9f Started work on previewing samples of fonts in the new font dialog. This adds all the boilerplate, including sample positioning. Also tightens up the dialog a bit. Now just to implement the actual drawing. 2016-04-16 17:58:45 -04:00