Update FLTK to 1.4.1 #87

dannye · 2024-10-23T03:23:51Z

Some caveats:

~~I haven't yet confirmed if ubuntu-latest from the github workflow already has a sufficient version of CMake installed or not.~~ Done
Feel free to veto the v143 platform toolset upgrade if you do not plan on updating your setup at this time.
The only significantly different steps in the Windows INSTALL instructions are steps 6, 7, 8, and 9. But I wrote them using Visual Studio 2022. I do not know for certain that the steps work exactly the same in VS 2019.

dannye · 2024-10-23T03:25:11Z

Makefile

+fltk-config = $(bindir)/fltk-config
+
+CXXFLAGS = -std=c++17 -I$(srcdir) -I$(resdir) $(shell $(fltk-config) --use-images --cxxflags)
+LDFLAGS = $(shell $(fltk-config) --use-images --ldflags) $(shell pkg-config --libs libpng xpm)


Using $(bindir)/fltk-config avoids the need for export PATH="$PWD/bin:$PATH" in INSTALL.md and .github/workflows/main.yml

dannye · 2024-10-23T03:26:51Z

INSTALL.md

+# Build FLTK 1.4.0
+git clone --branch release-1.4.0rc1 --depth 1 https://github.com/fltk/fltk.git lib/fltk
+pushd lib/fltk
+cmake -D CMAKE_INSTALL_PREFIX="$(realpath "$PWD/../..")" -D CMAKE_BUILD_TYPE=Release -D FLTK_GRAPHICS_CAIRO=1 -D FLTK_BACKEND_WAYLAND=0


Updated this to clone into lib/fltk instead of fltk (to match the Windows instructions).
(also updated in .github/workflows/main.yml so that the cmake command is identical) (Edit: the cmake command is no longer identical because the github workflow also skips building fltk_gl and fltk tests.)

dannye · 2024-10-23T03:29:57Z

src/main.cpp

@@ -69,7 +70,9 @@ int main(int argc, char **argv) {
 #ifdef _WIN32
 	SetCurrentProcessExplicitAppUserModelID(MAKE_WSTR(PROGRAM_AUTHOR) L"." MAKE_WSTR(PROGRAM_NAME));
 #endif
+	Fl::keyboard_screen_scaling(0);


Fl::keyboard_screen_scaling(0); disables the new FLTK window scaling keyboard shortcuts Ctrl -/+ since Ctrl + is already in use by the magnifying glass icon.

FLTK's high DPI rendering support is still in effect if the display is already scaled by the OS instead of by the user.

dannye · 2024-10-23T03:31:10Z

src/main.cpp

 	Fl::visual(FL_DOUBLE | FL_RGB);
+	fl_contrast_level(50);


FLTK has a newer improved contrast algorithm, and a new default contrast level of 39 instead of 50 (which is a good thing). But we set it back to 50 anyway because it works best for all 12 themes, particularly in the menubar.

dannye · 2024-10-23T03:32:59Z

src/themes.cpp

@@ -2370,7 +2371,7 @@ static void use_rose_gold_colors() {
 	Fl::background2(0xFF, 0xFF, 0xFF);
 	Fl::foreground(0x4C, 0x1E, 0x12);
 	Fl::set_color(FL_INACTIVE_COLOR, 0x60, 0x4C, 0x4C);
-	Fl::set_color(FL_SELECTION_COLOR, 0x15, 0x81, 0xFA);
+	Fl::set_color(FL_SELECTION_COLOR, 0x14, 0x79, 0xEA);


These 4 slight color tweaks allow the contrast level of 50 to actually work (as opposed to needing to raise the contrast level even higher, which would have other negative effects).

dannye · 2024-10-23T03:35:18Z

src/themes.cpp

-	fl_rect(x+1, y+1, w-2, h-2);
+	fl_line_style(FL_SOLID, 2);
+	fl_rect(x+1, y+1, w-1, h-1);
+	fl_line_style(FL_SOLID);


These 4 changes to drawing rects in the high contrast theme are necessary for the high contrast theme to look correct when high DPI screen scaling is in effect. Otherwise, there could be unexpected gaps between the two consecutive rectangles. This is fixed by drawing a single rectangle with a width of 2 instead. (Edit: this was re-done in an even better way; draw 4 rectangles -- one for each edge -- each with a width or height of 2.)

dannye · 2024-10-23T03:37:54Z

src/themes.cpp

@@ -3186,7 +3191,7 @@ void OS::use_native_fonts() {
 	use_any_font(FL_COURIER, monospace_fonts, _countof(monospace_fonts));
 	// Use common bold monospace font
 	const char *bold_monospace_fonts[] = {
-		"Ubuntu Mono bold", "Noto Sans Mono bold", "Droid Sans Mono bold", "DejaVu Sans Mono bold"
+		"Ubuntu Mono Bold", "Noto Sans Mono Bold", "Droid Sans Mono Bold", "DejaVu Sans Mono Bold"


This change became necessary after enabling Cairo+Pango drawing on X11 (instead of plain X11 drawing).
This comes from -D FLTK_GRAPHICS_CAIRO=1 in the cmake command.

Enabling Cairo+Pango on X11 isn't strictly necessary, but it avoids some bugs/quirks with plain X11 drawing and it looks better overall.

dannye · 2024-10-23T03:47:22Z

src/widgets.cpp

 		}
+		fl_pop_clip();
 	}


The "origin" of this change is simply that the Fl_Label struct had a few new fields added to it (h_margin_, v_margin_, and spacing) which were all uninitialized in this code.

This resulted in the "Palettes" dropdown being drawn incorrectly/unpredictably.

Instead of "just" fixing the uninitialized data, I rewrote this based on the latest Fl_Choice::draw() while preserving most of the customizations, since there are substantial useful changes in 1.4.0 especially in the first half.

I couldn't fully decipher the purpose the custom changes to the second half (the displacement of fl_push_clip()/fl_pop_clip(), the recalculation of ww on old line 380) so I just went with the latest Fl_Choice::draw() and the final result looks the same to me AFAICT. If you have a reason for these customizations, let me know.

I originally did this in dannye/crystal-tracker@fb01b5b

dannye · 2024-10-23T03:48:40Z

include/png.h

@@ -1,9 +1,9 @@



All the png and zlib header files were re-copied straight from fltk-1.4.1/png and fltk-1.4.1/zlib.

dannye · 2024-10-23T03:56:23Z

src/palette-window.cpp

@@ -1,6 +1,10 @@
 #include <queue>
 #include <utility>

+#pragma warning(push, 0)
+#include <FL/platform.H>
+#pragma warning(pop)


I'm not sure these warning(push, 0)/warning(pop) are actually useful anymore. What do you think?

@Rangi42 So FLTK (1.3 and 1.4) can produce warnings for "conversion from/to, possible loss of data" in several FL header files.
They are mostly for assigning from (int) enum to uchar.

I figured out these warnings are only triggered with <WarningLevel>Level4</WarningLevel> in the .vcxproj file.

Level3 (which is what I've always used in crystal-tracker) doesn't produce a warning for these enum/uchar assignments.

I personally like Level3 more than Level4 in general, because I don't really care to be warned about "unreferenced formal parameter" etc.

So the options are:

Leave the #pragmas

Switch to Level3

Get FLTK to add the appropriate casts in the public header files (I'll try to make this happen)

fltk/fltk#1126

It didn't make it into 1.4.0 but that's okay. I'll just leave the #pragmas.

src/modal-dialog.cpp

dannye · 2024-12-03T19:08:49Z

INSTALL.md

@@ -53,7 +55,7 @@ Run the following commands:

 ```bash
 sudo dnf install make g++ git autoconf
-sudo dnf install zlib-devel libpng-devel libXpm-devel libX11-devel libXft-devel libXinerama-devel fontconfig-devel libXext-devel libXrender-devel libXfixes-devel
+sudo dnf install zlib-devel libpng-devel libXpm-devel libX11-devel libXft-devel libXinerama-devel fontconfig-devel libXext-devel libXrender-devel libXfixes-devel libcairo2-devel libpango1.0-devel


I didn't actually test this on Fedora, I just followed the convention of changing "dev" to "devel"...

Update FLTK to 1.4.0rc1

26be33e

dannye commented Oct 23, 2024

View reviewed changes

src/modal-dialog.cpp Show resolved Hide resolved

dannye commented Oct 23, 2024

View reviewed changes

src/modal-dialog.cpp Show resolved Hide resolved

Misc bug fixes

ccc8af9

dannye force-pushed the fltk1.4 branch from 095f47b to ccc8af9 Compare October 23, 2024 13:57

Fix Linux build

100b5d1

dannye force-pushed the fltk1.4 branch from f57cb9f to 100b5d1 Compare October 23, 2024 22:54

dannye added 3 commits November 3, 2024 16:35

Update FLTK to 1.4.0rc2

48fc3e9

Remove unnecessary fltk maximize override

5232a01

Fix Help window stale link color when changing themes

a175f9c

dannye changed the title ~~Update FLTK to 1.4.0rc1~~ Update FLTK to 1.4.0rc2 Nov 3, 2024

dannye mentioned this pull request Nov 7, 2024

[Bug] X11: fl_draw_image() with horizontal flip reads out of bounds fltk/fltk#1112

Closed

Update FLTK to 1.4.0rc3

0ce27bd

dannye changed the title ~~Update FLTK to 1.4.0rc2~~ Update FLTK to 1.4.0rc3 Nov 9, 2024

dannye added 4 commits November 16, 2024 15:54

Always use FL_RGB_SCALING_NEAREST

ee22f9a

Reset scale when copying pixels

9fcaba0

Remove outdated #pragma warning

904a508

Update FLTK to 1.4.0

505cc39

dannye changed the title ~~Update FLTK to 1.4.0rc3~~ Update FLTK to 1.4.0 Nov 18, 2024

Improve high contrast high DPI display

9c573cf

dannye added 2 commits November 30, 2024 15:14

Skip building fltk_gl and fltk tests

5569348

github workflow: install cairo+pango

2977b1c

dannye commented Dec 3, 2024

View reviewed changes

dannye added 2 commits December 12, 2024 21:33

Update FLTK to 1.4.1

c74b2bd

Fix markdown

e935929

dannye changed the title ~~Update FLTK to 1.4.0~~ Update FLTK to 1.4.1 Dec 13, 2024

Update main.yml

1d7dd5b

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update FLTK to 1.4.1 #87

Update FLTK to 1.4.1 #87

dannye commented Oct 23, 2024 •

edited

Loading

dannye Oct 23, 2024 •

edited

Loading

dannye Oct 23, 2024 •

edited

Loading

dannye Oct 23, 2024

dannye Oct 23, 2024

dannye Oct 23, 2024

dannye Oct 23, 2024 •

edited

Loading

dannye Oct 23, 2024

dannye Oct 23, 2024 •

edited

Loading

dannye Oct 23, 2024 •

edited

Loading

dannye Oct 23, 2024

dannye Nov 16, 2024

dannye Nov 17, 2024

dannye Nov 18, 2024

dannye Dec 3, 2024

Update FLTK to 1.4.1 #87

Are you sure you want to change the base?

Update FLTK to 1.4.1 #87

Conversation

dannye commented Oct 23, 2024 • edited Loading

dannye Oct 23, 2024 • edited Loading

Choose a reason for hiding this comment

dannye Oct 23, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dannye Oct 23, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dannye Oct 23, 2024 • edited Loading

Choose a reason for hiding this comment

dannye Oct 23, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dannye commented Oct 23, 2024 •

edited

Loading

dannye Oct 23, 2024 •

edited

Loading

dannye Oct 23, 2024 •

edited

Loading

dannye Oct 23, 2024 •

edited

Loading

dannye Oct 23, 2024 •

edited

Loading

dannye Oct 23, 2024 •

edited

Loading