oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,765 Commits 1 Branch 0 Tags
95ef61bc45efbcbfed13a040ec8da75d5c6f398e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marshall Bowers 95ef61bc45 Thread click handler through from workspace to language selector 2023-10-10 18:02:08 -04:00
Marshall Bowers c142676b20 Add click handlers to some of the buttons in the StatusBar 2023-10-10 17:26:53 -04:00
Marshall Bowers be843227a1 Add on_click to IconButton 2023-10-10 17:26:33 -04:00
Marshall Bowers 48d9b49ada Wire up click handlers on Buttons 2023-10-10 17:19:18 -04:00
Marshall Bowers f2ee61553f Colocate element stories with their elements 2023-10-10 16:00:04 -04:00
Marshall Bowers 30088afa89 Colocate component stories with their components 2023-10-10 15:52:58 -04:00
Marshall Bowers b1d88ced61 Add an example of colocating a story for a UI component with its definition 2023-10-10 15:30:16 -04:00
Marshall Bowers 5b7ca6435c Comment out overridden widths 2023-10-10 15:17:44 -04:00
Marshall Bowers a6ae6b0752 Merge branch 'gpui2' into gpui2-ui 2023-10-10 15:12:59 -04:00
Marshall Bowers 8f7f38536d Re-enable hover styles 2023-10-10 11:48:25 -04:00
Marshall Bowers 40d58c9bc3 Use Self::State in children_any and child_any 2023-10-10 11:26:18 -04:00
Marshall Bowers f76c9041bb Merge branch 'gpui2' into marshall/gpui2-playground 2023-10-10 11:24:45 -04:00
Marshall Bowers 08f4576aa6 Rename helper style 2023-10-09 18:17:01 -04:00
Marshall Bowers 7610028a89 Add a story showcasing z-index 2023-10-09 18:00:49 -04:00
Marshall Bowers 0d903f4d0d Clean up theme loading 2023-10-09 17:00:10 -04:00
Marshall Bowers 312f3d2ab9 Change how the default theme gets determined 2023-10-09 16:53:28 -04:00
Marshall Bowers def67295e5 Add theme loading 2023-10-09 16:37:20 -04:00
Marshall Bowers 613973d2b1 Add support for switching between the two hardcoded themes 2023-10-09 15:52:57 -04:00
Marshall Bowers 8b3a357949 Add note about CSS hack 2023-10-09 13:39:08 -04:00
Marshall Bowers f73708d725 Add a Toast in the bottom-right corner 2023-10-09 13:32:19 -04:00
Marshall Bowers d3c79c7078 Add div.z_index 2023-10-09 13:19:32 -04:00
Marshall Bowers 2654942b3c Use command modifier for example keybindings in CommandPalette 2023-10-09 12:51:57 -04:00
Marshall Bowers ed2c8cdc25 Add strikethrough support back to Label 2023-10-09 12:33:52 -04:00
Marshall Bowers 19434afe0a Add back negative margins, now that they're supported again 2023-10-09 12:33:30 -04:00
Marshall Bowers a7c4ae530d Update gpui3_macros::style_helpers! based on its gpui2 equivalent 2023-10-09 12:31:22 -04:00
Marshall Bowers 42e9800bde Add Details component 2023-10-09 11:55:27 -04:00
Marshall Bowers d956bd3743 Add RecentProjects component 2023-10-09 11:47:22 -04:00
Marshall Bowers 100a4731e2 Add ThemeSelector component 2023-10-09 11:44:08 -04:00
Marshall Bowers 000ae27aff Add LanguageSelector component 2023-10-09 11:39:42 -04:00
Marshall Bowers 06b0707aa9 Add MultiBuffer component 2023-10-09 11:36:09 -04:00
Marshall Bowers ac93449788 Remove unused Arc import 2023-10-09 11:32:10 -04:00
Marshall Bowers 02d32de044 Add Toast component 2023-10-09 11:31:56 -04:00
Marshall Bowers 333e3e4f01 Add ContextMenu component 2023-10-09 11:25:33 -04:00
Marshall Bowers f7721d0523 Add CommandPalette component 2023-10-09 11:20:10 -04:00
Marshall Bowers e5473fc51a Add Palette component 2023-10-09 11:15:50 -04:00
Marshall Bowers a08ceadd1a Rename view_type to state_type 2023-10-09 11:11:03 -04:00
Marshall Bowers dc2ddfb42c Add Keybinding component 2023-10-09 11:09:44 -04:00
Marshall Bowers 4eeed14d34 Add CollabPanel component 2023-10-09 11:04:53 -04:00
Marshall Bowers 8814ea8241 Time compute_layout 2023-10-07 12:23:25 -04:00
Marshall Bowers 8f6649e29e Merge branch 'gpui2' into marshall/gpui2-playground 2023-10-07 12:16:48 -04:00
Marshall Bowers 73360d37f7 Merge branch 'main' into gpui2 2023-10-07 12:15:23 -04:00
Marshall Bowers eb642551ac Add TitleBar component and wire up to the workspace 2023-10-07 12:10:39 -04:00
Marshall Bowers f33d41af63 Add Facepile and PlayerStack components 2023-10-07 12:02:42 -04:00
Marshall Bowers 5e7954f152 Add TrafficLights component 2023-10-07 11:55:10 -04:00
Marshall Bowers 9e79ad5a62 Add ChatPanel component 2023-10-07 11:50:41 -04:00
Marshall Bowers 0dcbc47e15 Remove duplicate module declaration 2023-10-07 11:42:50 -04:00
Marshall Bowers b8b8fe6120 Add Button component 2023-10-07 11:41:48 -04:00
Marshall Bowers ff066ef177 Add EditorPane component and wire up in the workspace 2023-10-07 11:33:11 -04:00
Marshall Bowers 63e834ce73 Add Toolbar component 2023-10-07 11:21:09 -04:00
Marshall Bowers b118e60160 Add Breadcrumb component 2023-10-07 11:18:06 -04:00
Marshall Bowers 00e8531898 Add TabBar component 2023-10-07 11:13:54 -04:00
Marshall Bowers 7c8d662315 Increase storybook window size 2023-10-07 11:09:21 -04:00
Marshall Bowers 2f6d67cad6 Update Cargo.lock 2023-10-07 10:56:21 -04:00
Marshall Bowers f5e5b44bc1 Merge branch 'gpui2' into marshall/gpui2-playground 2023-10-07 10:54:17 -04:00
Marshall Bowers f795177ab6 Fix icon paths 2023-10-07 10:51:19 -04:00
Marshall Bowers a4bde421db Revert changes to gpui2 crate 2023-10-07 10:50:50 -04:00
Marshall Bowers f6a4151f60 Merge branch 'main' into gpui2 2023-10-07 10:50:05 -04:00
Marshall Bowers 82577b4acc Add Terminal component 2023-10-06 18:50:49 -04:00
Marshall Bowers 8db7f7ed37 Add Tab component 2023-10-06 18:43:25 -04:00
Marshall Bowers d5ffd4a1fb Add Pane and PaneGroup components 2023-10-06 18:37:28 -04:00
Marshall Bowers b53579858a Add StatusBar component 2023-10-06 18:25:55 -04:00
Marshall Bowers 28d504d7d3 Add WorkspaceElement component 2023-10-06 18:19:12 -04:00
Marshall Bowers 56c2ac048d Add ProjectPanel component 2023-10-06 17:58:23 -04:00
Marshall Bowers 208d5df106 Add Buffer component 2023-10-06 17:47:10 -04:00
Marshall Bowers d09f53c380 Add AssistantPanel component 2023-10-06 17:24:52 -04:00
Marshall Bowers 696aee3891 Add IconButton component 2023-10-06 17:16:00 -04:00
Marshall Bowers bcad2f4e9e Move UI out of storybook2 and into ui2 2023-10-06 17:07:59 -04:00
Marshall Bowers 1cf5cdbeca Add ui2 crate 2023-10-06 16:52:05 -04:00
Marshall Bowers 8e94f3902b Merge branch 'marshall/merge-main-into-gpui2' into marshall/gpui2-playground 2023-10-06 16:47:40 -04:00
Marshall Bowers 88a6a41c7c Revert changes to gpui2 crate 2023-10-06 15:49:53 -04:00
Marshall Bowers d37785c214 Fix icon paths 2023-10-06 15:46:02 -04:00
Marshall Bowers b369a6dc2a Merge branch 'main' into marshall/merge-main-into-gpui2 2023-10-06 15:41:18 -04:00
Marshall Bowers 5ee6814947 Fix compile errors 2023-10-06 13:54:37 -04:00
Marshall Bowers 65cd4f5838 Restore Sized bound on StyleHelpers 2023-10-06 13:45:56 -04:00
Marshall Bowers 7fd35d68bb Merge branch 'gpui2' into marshall/gpui2-playground 2023-10-06 13:45:11 -04:00
Marshall Bowers ad8187b151 Merge branch 'main' into marshall/gpui2-playground 2023-10-06 13:33:04 -04:00
Marshall BowersNate ButlerAntonio Scandurra
 		456baaa112 Mainline GPUI2 UI work (#3099) 
This PR mainlines the current state of new GPUI2-based UI from the
`gpui2-ui` branch.

Included in this is a performance improvement to make use of the
`TextLayoutCache` when calling `layout` for `Text` elements.

Release Notes:

- N/A

---------

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Antonio Scandurra <me@as-cii.com>
 2023-10-06 13:18:56 -04:00
Marshall Bowers 79ad5c08e4 Add profiling information for compute_layout 2023-10-06 10:48:25 -04:00
Marshall Bowers 45d08c70f0 Add .when to Elements 2023-10-04 18:33:28 -04:00
Marshall Bowers 77feecc623 Add List component 2023-10-04 18:25:43 -04:00
Marshall Bowers 332f3f5617 Merge branch 'gpui2' into marshall/gpui2-playground 2023-10-04 17:32:21 -04:00
Marshall Bowers 339ba7986f Add Avatar element 2023-10-04 15:34:14 -04:00
Marshall Bowers 249e6fe637 Add Icon element 2023-10-04 13:46:45 -04:00
Marshall Bowers e84b8747a1 Add storybook CLI 2023-10-04 13:33:28 -04:00
Marshall Bowers 0323a60d85 Remove unneeded theme function 
This also fixes the panic when trying to declare the `GPUIApplication` class.
 2023-10-04 13:11:02 -04:00
Marshall Bowers a05cbf8169 Begin setting up stories 2023-10-04 12:49:06 -04:00
Marshall Bowers 4b793f44ef Wire up hacky children for Panel 2023-10-04 11:22:33 -04:00
Marshall Bowers aae4f00a4b Render Panel 2023-10-04 10:58:23 -04:00
Marshall Bowers 366a4918c3 Fix icon paths 2023-10-04 10:52:39 -04:00
Marshall Bowers 25cd12cf33 Fix icon name 2023-10-04 10:41:21 -04:00
Marshall Bowers 90e22da930 Render workspace 2023-10-04 10:37:29 -04:00
Marshall Bowers e6c7e57711 Merge branch 'gpui2' into marshall/gpui2-playground 2023-10-04 10:33:40 -04:00
Marshall Bowers 30afc8b1d2 WIP: Panel 2023-10-02 20:16:55 -04:00
Marshall Bowers 74ac6eb8a3 Begin building out new ui crate in storybook2 2023-10-02 18:59:44 -04:00
Marshall Bowers 9a9a35bf40 Move Sized bound up onto StyleHelpers 2023-10-02 18:46:25 -04:00
Marshall Bowers d14dc35efe Merge branch 'gpui2' into marshall/gpui2-playground 2023-10-02 18:36:22 -04:00
Marshall BowersNate ButlerPiotr OsiewiczNate
 		9e1f7c4c18 Mainline GPUI2 UI work (#3079) 
This PR mainlines the current state of new GPUI2-based UI from the
`gpui2-ui` branch.

Release Notes:

- N/A

---------

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Co-authored-by: Nate <nate@zed.dev>
 2023-10-02 18:20:47 -04:00
Marshall Bowers 77e67c19fe Fix deadlock when obtaining the font ID 2023-10-02 16:10:41 -04:00
Marshall Bowers 46b4118b9e Checkpoint: Things are running, but with a stack overflow 2023-09-29 22:57:17 -04:00
Marshall Bowers c7fc5f3ab7 Checkpoint: Fix downcasting 2023-09-29 22:53:24 -04:00