Skip to content

Paint: EGA Compatibility and UI Enhancements#2275

Merged
ghaerr merged 2 commits intoghaerr:masterfrom
Vutshi:master
Mar 31, 2025
Merged

Paint: EGA Compatibility and UI Enhancements#2275
ghaerr merged 2 commits intoghaerr:masterfrom
Vutshi:master

Conversation

@Vutshi
Copy link
Copy Markdown
Contributor

@Vutshi Vutshi commented Mar 31, 2025

Description:

  • Paint is now EGA-compatible! To enable EGA mode, set export EGAMODE=1 before running paint. This also switches the mouse cursor to a smaller size (which can be toggled by pressing m).
  • Added a new side panel with updated buttons and icons.
  • Brush buttons are now generated by code.

@ghaerr
Copy link
Copy Markdown
Owner

ghaerr commented Mar 31, 2025

This looks great @Vutshi! Thank you for the enhancements and PR! :)

Are you ready for commit?

I can't quite tell if you have deleted the images/bs?.bmp files, or just changed them and are keeping them around for testing.
If you want to delete them, use "git rm images/bs?.bmp" and then "git commit -a; git push" to update this PR with another change.

Let me know either way and we'll get this committed ASAP. Can't wait to try to out :)

@Vutshi
Copy link
Copy Markdown
Contributor Author

Vutshi commented Mar 31, 2025

This looks great @Vutshi! Thank you for the enhancements and PR! :)

Are you ready for commit?

I think so.

I can't quite tell if you have deleted the images/bs?.bmp files, or just changed them and are keeping them around for testing.

I deleted all bs*.bmp and pushed the changes to my fork. It seems to show that they are deleted.

@ghaerr
Copy link
Copy Markdown
Owner

ghaerr commented Mar 31, 2025

I deleted all bs*.bmp and pushed the changes to my fork. It seems to show that they are deleted.

If you don't use "git rm" but just "rm", strange things can happen. I'll commit this now, and we'll see what happened.

@ghaerr ghaerr merged commit 02e89c3 into ghaerr:master Mar 31, 2025
@ghaerr
Copy link
Copy Markdown
Owner

ghaerr commented Mar 31, 2025

Works great! Yes, the bs?.bmp files were deleted, thanks!

I am also using the new 8086 toolchain C86 compiler (as well as OpenWatcom) to compile Paint. It seems C86 has found something it doesn't like (again) in render.c and that compiler is crashing. I may push a fix if I can figure out what's wrong with it using '#ifdef C86', FYI.

Are you still planning on adding a "fill/bucket" icon? :)

@ghaerr
Copy link
Copy Markdown
Owner

ghaerr commented Mar 31, 2025

BTW, you'll also want to update the "origin" of the local copy of your ELKS fork, delete the branch and pull from master to keep updated, before possibly beginning the cycle again with another PR.

To do this:

  1. cd elks-yourcopy
  2. git remote add upstream https://github.com/ghaerr/elks.git
  3. git checkout master (changes back to master branch on your repo)
  4. git pull upstream master (pulls changes from my master branch)
  5. git push (pushes all changes back to your repo)
  6. git branch -d paintchanges (removes the old branch, do this on the PR webpage button as well)

@Vutshi
Copy link
Copy Markdown
Contributor Author

Vutshi commented Mar 31, 2025

Are you still planning on adding a "fill/bucket" icon? :)

yes, I’ll add more icons.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants