Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project system #23

Draft
wants to merge 140 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
140 commits
Select commit Hold shift + click to select a range
b0fd2cb
Create a basic outline
JoshuaMKW Jun 21, 2024
004a58a
Context fix
JoshuaMKW Jun 21, 2024
70867eb
Create filesystem model outline
JoshuaMKW Jun 21, 2024
8719570
Fix path issue for Dolphin integration
JoshuaMKW Jul 10, 2024
2868efb
Current progress
JoshuaMKW Sep 5, 2024
d2d34c9
Merge branch 'master' into project-system
JoshuaMKW Sep 6, 2024
8fb0202
Migrate work into a ProjectManager
JoshuaMKW Sep 7, 2024
7f7bc56
Much progress with seemingly functional model and proxy
JoshuaMKW Sep 9, 2024
714f99f
Push more progress
JoshuaMKW Sep 10, 2024
fae7338
View works but has performance issues
JoshuaMKW Sep 11, 2024
bd79451
Update imgui submodule
JoshuaMKW Sep 11, 2024
ffc72eb
Update imgui_ext and fix bugs
JoshuaMKW Sep 11, 2024
59534ee
Memory leak exists in proxy model
JoshuaMKW Sep 13, 2024
4257c35
Merge branch 'master' into project-system
HazardousPeach Sep 17, 2024
7e60811
Fix missing return on loadProjectFolder
HazardousPeach Sep 18, 2024
cd8383a
Oops don't crash on empty dolphin paths
HazardousPeach Sep 18, 2024
cd6bea5
Type this buffer to fix some valgrind warnings
HazardousPeach Sep 18, 2024
5d59221
Fix memory leak of ModelIndex user data
HazardousPeach Sep 19, 2024
1ddca44
Try reverting libiconv version upgrade to fix CI error
HazardousPeach Sep 19, 2024
14f182b
Remove dead code in fsmodel.cpp
HazardousPeach Sep 20, 2024
9008c95
Small reuse of a variable
HazardousPeach Sep 20, 2024
115530a
Allow entering folders through double click in folder view (project)
HazardousPeach Sep 20, 2024
73cf5ed
Add an indicator of which tree folder is open in folder view
HazardousPeach Sep 20, 2024
30bff8a
Add selection of items in folder view
HazardousPeach Sep 20, 2024
6cca6bb
Add multi-select
HazardousPeach Sep 20, 2024
84078df
Handle a warning and optimize semantics
JoshuaMKW Sep 22, 2024
e5c03d1
Set methods to const and initialize members on construct for FileDialog
JoshuaMKW Sep 22, 2024
2d8a9f5
Clicking on the text label area also selects item
HazardousPeach Sep 25, 2024
5cc02b9
Add ability to rename files in project manager
HazardousPeach Sep 27, 2024
1b815fc
Oops partial commits are hard
HazardousPeach Sep 27, 2024
6a1bb1d
Some nicer box sizes for renaming
HazardousPeach Sep 27, 2024
c963954
Fix folder navigation in the presence of renaming
HazardousPeach Sep 27, 2024
b509efd
Replace custom min/max with std:: versions
HazardousPeach Sep 27, 2024
2fc681c
Merge main into project-system
JoshuaMKW Sep 27, 2024
f3dbb5c
Fix memory leak and performance issue with proxy model
JoshuaMKW Sep 27, 2024
575cbab
Oops remove debug logging
HazardousPeach Sep 27, 2024
85af285
Add deleting logic
HazardousPeach Sep 27, 2024
6386119
Roughly merge new code for folder mnaip in
JoshuaMKW Sep 27, 2024
da7a3f3
Merge newest changes in
JoshuaMKW Sep 27, 2024
37e4642
Fix folder navigation and force proxy indexes to match their source uuid
JoshuaMKW Sep 27, 2024
55e211d
Fix missing return
JoshuaMKW Sep 27, 2024
e70a5d6
Start implementation of basic watchdog
JoshuaMKW Sep 28, 2024
f702fcb
Watchdog works now
JoshuaMKW Sep 29, 2024
4579be2
Integrate watchdog updates into fs model
JoshuaMKW Sep 29, 2024
018db64
Fix race condition in filter proxy
JoshuaMKW Sep 29, 2024
67d613c
Start implementing context menu
JoshuaMKW Sep 29, 2024
400835a
Fix FileWatch.hpp to build on Unix platforms
HazardousPeach Sep 29, 2024
e6af823
Stablize visuals and stuff
JoshuaMKW Sep 30, 2024
eff39f7
Add support for shift-click range selection
JoshuaMKW Sep 30, 2024
deb5cfb
Adjust shift-click span selection logic to better match Windows
JoshuaMKW Sep 30, 2024
ac4d95c
More polish on context menu and such
JoshuaMKW Sep 30, 2024
5ba29d8
Allow copy-pasting files into JT on Linux
HazardousPeach Oct 1, 2024
85f8363
get index on copy instead of trying to make a new one
HazardousPeach Oct 1, 2024
5588e1d
Implement Windows open in explorer
JoshuaMKW Oct 1, 2024
68f3621
Merge branch 'project-system' of https://github.com/JoshuaMKW/Juniors…
JoshuaMKW Oct 1, 2024
29c874d
Fix missing .string() call
JoshuaMKW Oct 1, 2024
4e51b42
Fix build on linux by stubbing out file explorer
HazardousPeach Oct 1, 2024
3ddfeac
Add ability to open scene folders from a project folder
JoshuaMKW Oct 1, 2024
e095a47
Remove scene open from application open, and optimize otherwise
JoshuaMKW Oct 1, 2024
3730cc2
Merge branch 'project-system' of https://github.com/JoshuaMKW/Juniors…
JoshuaMKW Oct 1, 2024
059915c
Allow opening pad folders from project system
JoshuaMKW Oct 2, 2024
2deee8d
Windows clipboard support progress
JoshuaMKW Oct 3, 2024
ed5adb7
Fix lil' bugs
JoshuaMKW Oct 3, 2024
7b9d933
Allow for pasting of files on windows and some misc changes
JoshuaMKW Oct 3, 2024
ddfdb95
Crappy implementation of pasting out that blocks the main thread inde…
HazardousPeach Oct 3, 2024
31b2506
Some clang format stuff on my code
HazardousPeach Oct 3, 2024
c6a544b
Clean up resources properly
HazardousPeach Oct 3, 2024
e3615d0
Pasting without blocking using glfw hooks
HazardousPeach Oct 3, 2024
f85749f
Use glfw display but fresh window for copying in too
HazardousPeach Oct 3, 2024
059382f
Don't rely on a false copy to own selection
HazardousPeach Oct 3, 2024
9e30f6f
Const some methods
HazardousPeach Oct 3, 2024
b30cb3f
Refactor an allow pasting any mime type
HazardousPeach Oct 3, 2024
cb6e37e
Some clangformat stuff
HazardousPeach Oct 3, 2024
43d3547
Mild refactoring
JoshuaMKW Oct 4, 2024
d75e699
Enable drag and drop of files from explorer to project view
JoshuaMKW Oct 4, 2024
4da8577
Add comments to copying-out code
HazardousPeach Oct 4, 2024
297e123
OOps don't try to close the GLFW display
HazardousPeach Oct 4, 2024
c175074
Merge new Linux copying-out support with Windows copying support
HazardousPeach Oct 4, 2024
5b803ec
Don't print "Setting window callbacks" every frame.
HazardousPeach Oct 4, 2024
195abc0
Drag/drop start work
JoshuaMKW Oct 4, 2024
76fdd23
Merge updates
JoshuaMKW Oct 4, 2024
3410375
Oops update remote and commit for glfw for our hooks
HazardousPeach Oct 4, 2024
af85b3f
Implement text clipboard on linux
HazardousPeach Oct 4, 2024
31121b0
Current progress
JoshuaMKW Oct 5, 2024
c713484
More progress, gotta fix size and position updates
JoshuaMKW Oct 5, 2024
608daaa
Fix compile errors
JoshuaMKW Oct 5, 2024
937d5ef
Merge branch 'project-system' of https://github.com/JoshuaMKW/Juniors…
JoshuaMKW Oct 6, 2024
9ae5a8a
Improve size/pos update logic and practically finish windows integration
JoshuaMKW Oct 6, 2024
d69f01e
Stablize much of drag/drop functionality
JoshuaMKW Oct 7, 2024
c2bd344
Establish a very basic drag render
JoshuaMKW Oct 7, 2024
046c91c
Fix include problems
JoshuaMKW Oct 7, 2024
808ab5e
Fix declaration errors
JoshuaMKW Oct 7, 2024
24e3a2c
Provide stub implementations for Linux
JoshuaMKW Oct 7, 2024
ce69974
Basic image manipulation algorithms (#35)
JoshuaMKW Oct 9, 2024
c7ca9a5
Enhance drag icon rendering
JoshuaMKW Oct 9, 2024
7f92715
Drag internal wip
JoshuaMKW Oct 10, 2024
581c3ca
UI drag stuff
JoshuaMKW Oct 10, 2024
3f418e1
Further polish project interactions
JoshuaMKW Oct 10, 2024
7ecd7c1
Don't fight the window manager
HazardousPeach Oct 11, 2024
4dde55f
Reuse the GLFW display connection for everything
HazardousPeach Oct 11, 2024
5c771af
Oops fix the linux build
HazardousPeach Oct 13, 2024
125bdf0
Set the variables that indicate whether size and pos have changed.
HazardousPeach Oct 14, 2024
3ba83e3
Clipboard api refactor (#36)
HazardousPeach Oct 14, 2024
f722dd3
Fix up project-system to use new clipboard api
HazardousPeach Oct 14, 2024
dd129ca
Fixes for the windows code in clipboard api
HazardousPeach Oct 14, 2024
675f576
Oops fix some more windows issues
HazardousPeach Oct 15, 2024
c786d28
Make getContentType a friend function
HazardousPeach Oct 15, 2024
d29053c
Some clang-format stuff
HazardousPeach Oct 15, 2024
c5bd30d
Oops don't declare windows-specific function on Linux
HazardousPeach Oct 15, 2024
8a06024
Fix some more windows build errors
HazardousPeach Oct 15, 2024
f54836a
Stuff
JoshuaMKW Oct 15, 2024
04c23f4
Merge branch 'project-system' of https://github.com/JoshuaMKW/Juniors…
JoshuaMKW Oct 15, 2024
78f9158
Disable system drag from app for now
JoshuaMKW Oct 18, 2024
fa0b767
New dialog (#37)
JoshuaMKW Oct 21, 2024
9662506
Make some adjustments and add folder creation
JoshuaMKW Oct 21, 2024
7011bec
Enhance fsmodel logic and signaling process
JoshuaMKW Oct 21, 2024
69ac1f8
Adjust code to hopefully make Linux compatible
JoshuaMKW Oct 21, 2024
0ee4920
Remove old comments
JoshuaMKW Oct 22, 2024
ed26651
Undo the bad window sizing fix and introduce a new one
HazardousPeach Oct 23, 2024
8c97e20
Fix file watching in subdirectories on Linux
HazardousPeach Oct 24, 2024
6a05975
Oops not sure how I didn't catch this.
HazardousPeach Oct 26, 2024
0d90943
Debug message instead of error on empty string rename
HazardousPeach Oct 28, 2024
7ed8650
Update glfw fork to include the docs
HazardousPeach Oct 28, 2024
5ddc437
Visual indicator for invalid rename targets
HazardousPeach Oct 28, 2024
9d8ad17
Don't put windows file restrictions on Linux builds
HazardousPeach Oct 29, 2024
90664b7
Case insensitive file name matching for rename on windows
HazardousPeach Oct 30, 2024
4211163
Document where the windows filename constraints came from
HazardousPeach Oct 30, 2024
68713e5
Windows filenames cannot end with a space or period
HazardousPeach Oct 30, 2024
c1e228b
More windows file constraints
HazardousPeach Oct 30, 2024
25eb30d
Clang formatting rename validation code
HazardousPeach Oct 30, 2024
49ec817
Clang format some of the naming checking code
HazardousPeach Oct 30, 2024
e9e3fc0
Oops bad syntax
HazardousPeach Oct 30, 2024
2c371d0
Check condition on keybind actions *after* taking open action
HazardousPeach Oct 30, 2024
6d88757
Allow deselecting a single item in project view
HazardousPeach Oct 30, 2024
58471a5
Allow adding modifiers to keybindings
HazardousPeach Nov 4, 2024
97d9523
Some clang format stuff
HazardousPeach Nov 4, 2024
fa8922e
Assert that modifier keys aren't passed as normal keys
HazardousPeach Nov 4, 2024
9b327f8
More format stuff
HazardousPeach Nov 4, 2024
d767a48
Update scene window bindings to new system
HazardousPeach Nov 12, 2024
e5e5d1b
Fix both file handling paths triggering on dialog close
HazardousPeach Nov 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update glfw fork to include the docs
HazardousPeach committed Oct 28, 2024
commit 7ed8650c101e63ace998a3d51e1c5cbd368e1015
2 changes: 1 addition & 1 deletion lib/glfw
Submodule glfw updated 95 files
+1 −1 .editorconfig
+4 −4 .github/workflows/build.yml
+2 −2 .gitignore
+9 −15 CMakeLists.txt
+16 −0 CONTRIBUTORS.md
+34 −317 README.md
+102 −0 deps/wayland/fractional-scale-v1.xml
+200 −0 deps/wayland/xdg-activation-v1.xml
+37 −26 docs/CMakeLists.txt
+5 −6 docs/CONTRIBUTING.md
+1 −1 docs/DoxygenLayout.xml
+1 −2 docs/SUPPORT.md
+163 −82 docs/build.md
+102 −82 docs/compat.md
+86 −110 docs/compile.md
+41 −44 docs/context.md
+1 −1 docs/extra.css
+1 −1 docs/extra.css.map
+4 −0 docs/extra.scss
+217 −153 docs/input.md
+9 −12 docs/internal.md
+96 −88 docs/intro.md
+2 −10 docs/main.md
+44 −55 docs/monitor.md
+149 −141 docs/moving.md
+0 −293 docs/news.dox
+65 −0 docs/news.md
+58 −60 docs/quick.md
+34 −37 docs/vulkan.md
+253 −212 docs/window.md
+194 −87 include/GLFW/glfw3.h
+18 −2 include/GLFW/glfw3native.h
+5 −2 src/CMakeLists.txt
+73 −75 src/cocoa_init.m
+1 −1 src/cocoa_joystick.h
+1 −3 src/cocoa_joystick.m
+23 −8 src/cocoa_monitor.m
+3 −3 src/cocoa_platform.h
+1 −1 src/cocoa_time.c
+1 −1 src/cocoa_time.h
+32 −27 src/cocoa_window.m
+5 −5 src/context.c
+52 −15 src/egl_context.c
+7 −3 src/glx_context.c
+12 −33 src/init.c
+52 −34 src/input.c
+39 −29 src/internal.h
+2 −2 src/linux_joystick.c
+1 −1 src/linux_joystick.h
+1 −1 src/mappings.h
+1 −1 src/mappings.h.in
+35 −26 src/monitor.c
+19 −14 src/nsgl_context.m
+73 −73 src/null_init.c
+1 −1 src/null_joystick.c
+1 −1 src/null_joystick.h
+4 −3 src/null_monitor.c
+13 −3 src/null_platform.h
+38 −7 src/null_window.c
+12 −9 src/osmesa_context.c
+23 −4 src/platform.c
+10 −1 src/platform.h
+1 −1 src/posix_module.c
+1 −1 src/posix_poll.c
+1 −1 src/posix_poll.h
+1 −1 src/posix_thread.c
+1 −1 src/posix_thread.h
+1 −1 src/posix_time.c
+1 −1 src/posix_time.h
+9 −6 src/vulkan.c
+21 −2 src/wgl_context.c
+76 −74 src/win32_init.c
+1 −1 src/win32_joystick.c
+1 −1 src/win32_joystick.h
+1 −1 src/win32_module.c
+30 −5 src/win32_monitor.c
+5 −2 src/win32_platform.h
+1 −1 src/win32_thread.c
+1 −1 src/win32_thread.h
+1 −1 src/win32_time.c
+1 −1 src/win32_time.h
+86 −9 src/win32_window.c
+118 −71 src/window.c
+139 −84 src/wl_init.c
+22 −11 src/wl_monitor.c
+30 −29 src/wl_platform.h
+546 −404 src/wl_window.c
+78 −78 src/x11_init.c
+35 −7 src/x11_monitor.c
+2 −2 src/x11_platform.h
+23 −15 src/x11_window.c
+1 −1 src/xkb_unicode.c
+1 −1 src/xkb_unicode.h
+24 −13 tests/events.c
+37 −7 tests/window.c