Skip to content

support for dark mode #452

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.

Sign up for GitHub

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

Closed
brtnfld wants to merge 6 commits into from
Closed

support for dark mode #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6afc64c
support for dark mode
brtnfld Jan 13, 2026
5a9d234
clang-format
brtnfld Jan 15, 2026
d5bac9b
clang-format
brtnfld Jan 15, 2026
52d128f
Merge branch 'master' into macfix1
brtnfld Jan 18, 2026
6324f6b
minor updates
brtnfld Jan 18, 2026
b99205c
clang-format
brtnfld Jan 20, 2026
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
2 changes: 2 additions & 0 deletions hdfview/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,8 @@
<arguments combine.children="append">
<argument>--icon</argument>
<argument>${project.basedir}/../package_files/macosx/HDFView.icns</argument>
<argument>--resource-dir</argument>
<argument>${project.basedir}/../package_files/macosx</argument>
<argument>--mac-entitlements</argument>
<argument>${project.basedir}/../lib/macosx/distribution.entitlements</argument>
<argument>--java-options</argument>
Expand Down
19 changes: 15 additions & 4 deletions hdfview/src/main/java/hdf/view/Chart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@

private Color barColor;

/**
* Tracks whether barColor was allocated by us and needs disposal.
* System colors should not be disposed.
*/
private boolean isBarColorOwned = false;

/** histogram style chart. */
public static final int HISTOGRAM = 0;

Expand Down Expand Up @@ -152,7 +158,8 @@

if (style == HISTOGRAM) {
isInteger = true;
barColor = new Color(Display.getDefault(), new RGB(0, 0, 255));
// Use system color directly - no need to create a duplicate
barColor = Display.getDefault().getSystemColor(SWT.COLOR_LIST_SELECTION);
}
else {
isInteger = false;
Expand Down Expand Up @@ -218,7 +225,8 @@
{
if (curFont != null)
curFont.dispose();
if (barColor != null)
// Only dispose barColor if we created it (not a system color)
if (isBarColorOwned && barColor != null)
barColor.dispose();
}
});
Expand Down Expand Up @@ -277,8 +285,11 @@
RGB newColor = dialog.open();

if (newColor != null) {
barColor.dispose();
barColor = new Color(Display.getDefault(), newColor);
// Dispose old color only if we created it
if (isBarColorOwned && barColor != null)
barColor.dispose();
barColor = new Color(Display.getDefault(), newColor);
isBarColorOwned = true; // We now own this color and must dispose it
chartP.redraw();
}
}
Expand Down Expand Up @@ -315,7 +326,7 @@
/** Find and set the minimum and maximum values of the data. */
private void findDataRange()
{
if (data == null)

Check warning

Code scanning / CodeQL

Dereferenced variable may be null Warning

Variable
barColor
Loading
may be null at this access as suggested by
this
Loading
null guard.
return;

ymin = data[0][0];
Expand Down
2 changes: 1 addition & 1 deletion hdfview/src/main/java/hdf/view/TableView/DefaultBaseTableView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ public void widgetDisposed(DisposeEvent e)

cellValueField = new Text(cellValueFieldScroller, SWT.MULTI | SWT.BORDER | SWT.WRAP);
cellValueField.setEditable(false);
cellValueField.setBackground(new Color(display, 255, 255, 240));
cellValueField.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
cellValueField.setEnabled(false);
cellValueField.setFont(curFont);

Expand Down
Loading