From 376760c24f7e7e46a189e557618321f5e05e8f4c Mon Sep 17 00:00:00 2001 From: Houssem Nasri Date: Thu, 24 Mar 2022 01:47:04 +0100 Subject: [PATCH 1/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f719dbf8742..a62785db499 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,6 @@ For IntelliJ IDEA, just import the project via a Gradle Import by pointing at th ## Sponsoring -JabRef development is powered by YourKit Java Profiler [![YourKit Java Profiler](https://www.yourkit.com/images/yk_logo.png)](https://www.yourkit.com/java/profiler/) +JabRef development is by YourKit Java Profiler [![YourKit Java Profiler](https://www.yourkit.com/images/yk_logo.png)](https://www.yourkit.com/java/profiler/) [JabRef]: https://www.jabref.org From 3c3fb02787dd450fd505aa65c80eaafccffd917a Mon Sep 17 00:00:00 2001 From: Houssem Nasri Date: Tue, 7 Jun 2022 13:49:26 +0100 Subject: [PATCH 2/9] Fix Readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 677fcc7e75c..78a90d2785d 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,6 @@ For IntelliJ IDEA, just import the project via a Gradle Import by pointing at th ## Sponsoring -JabRef development is by YourKit Java Profiler [![YourKit Java Profiler](https://www.yourkit.com/images/yk_logo.png)](https://www.yourkit.com/java/profiler/) +JabRef development is by powered YourKit Java Profiler [![YourKit Java Profiler](https://www.yourkit.com/images/yk_logo.png)](https://www.yourkit.com/java/profiler/) [JabRef]: https://www.jabref.org From 99f2ff81bfa37593575e390d8556dcba6b076c3b Mon Sep 17 00:00:00 2001 From: Houssem Nasri Date: Wed, 29 Jun 2022 00:59:50 +0100 Subject: [PATCH 3/9] Save SidePane width instead of divider position in preferences --- src/main/java/org/jabref/gui/JabRefFrame.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java index 2bbbf8f4412..91d074e7e7c 100644 --- a/src/main/java/org/jabref/gui/JabRefFrame.java +++ b/src/main/java/org/jabref/gui/JabRefFrame.java @@ -448,8 +448,10 @@ private void initLayout() { @Override public void invalidated(Observable observable) { if (mainStage.isShowing()) { - setDividerPosition(); - observable.removeListener(this); + Platform.runLater(() -> { + setDividerPosition(); + observable.removeListener(this); + }); } } }); @@ -472,10 +474,9 @@ private void updateSidePane() { } private void setDividerPosition() { - splitPane.setDividerPositions(prefs.getGuiPreferences().getSidePaneWidth()); if (mainStage.isShowing() && !sidePane.getChildren().isEmpty()) { - dividerSubscription = EasyBind.subscribe(splitPane.getDividers().get(0).positionProperty(), - position -> prefs.getGuiPreferences().setSidePaneWidth(position.doubleValue())); + splitPane.setDividerPositions(prefs.getGuiPreferences().getSidePaneWidth() / splitPane.getWidth()); + dividerSubscription = EasyBind.subscribe(sidePane.widthProperty(), width -> prefs.getGuiPreferences().setSidePaneWidth(width.doubleValue())); } } From a60d0e2ebacb19b640e6dcd29e0695b58c0367cd Mon Sep 17 00:00:00 2001 From: Houssem Nasri Date: Wed, 29 Jun 2022 01:09:59 +0100 Subject: [PATCH 4/9] Move sidePaneWidth from GuiPreferences to SidePanePreferences --- src/main/java/org/jabref/gui/JabRefFrame.java | 4 ++-- .../jabref/preferences/GuiPreferences.java | 18 +-------------- .../jabref/preferences/JabRefPreferences.java | 11 +++++----- .../preferences/SidePanePreferences.java | 22 +++++++++++++++++-- 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java index 91d074e7e7c..e11c9ed3637 100644 --- a/src/main/java/org/jabref/gui/JabRefFrame.java +++ b/src/main/java/org/jabref/gui/JabRefFrame.java @@ -475,8 +475,8 @@ private void updateSidePane() { private void setDividerPosition() { if (mainStage.isShowing() && !sidePane.getChildren().isEmpty()) { - splitPane.setDividerPositions(prefs.getGuiPreferences().getSidePaneWidth() / splitPane.getWidth()); - dividerSubscription = EasyBind.subscribe(sidePane.widthProperty(), width -> prefs.getGuiPreferences().setSidePaneWidth(width.doubleValue())); + splitPane.setDividerPositions(prefs.getSidePanePreferences().getSidePaneWidth() / splitPane.getWidth()); + dividerSubscription = EasyBind.subscribe(sidePane.widthProperty(), width -> prefs.getSidePanePreferences().setSidePaneWidth(width.doubleValue())); } } diff --git a/src/main/java/org/jabref/preferences/GuiPreferences.java b/src/main/java/org/jabref/preferences/GuiPreferences.java index 08f9e199c84..62c5735effc 100644 --- a/src/main/java/org/jabref/preferences/GuiPreferences.java +++ b/src/main/java/org/jabref/preferences/GuiPreferences.java @@ -33,8 +33,6 @@ public class GuiPreferences { private final ObjectProperty mergeDiffMode; - private final DoubleProperty sidePaneWidth; - public GuiPreferences(double positionX, double positionY, double sizeX, @@ -44,8 +42,7 @@ public GuiPreferences(double positionX, Path lastFocusedFile, FileHistory fileHistory, String lastSelectedIdBasedFetcher, - DiffMode mergeDiffMode, - double sidePaneWidth) { + DiffMode mergeDiffMode) { this.positionX = new SimpleDoubleProperty(positionX); this.positionY = new SimpleDoubleProperty(positionY); this.sizeX = new SimpleDoubleProperty(sizeX); @@ -55,7 +52,6 @@ public GuiPreferences(double positionX, this.lastFocusedFile = new SimpleObjectProperty<>(lastFocusedFile); this.lastSelectedIdBasedFetcher = new SimpleStringProperty(lastSelectedIdBasedFetcher); this.mergeDiffMode = new SimpleObjectProperty<>(mergeDiffMode); - this.sidePaneWidth = new SimpleDoubleProperty(sidePaneWidth); this.fileHistory = fileHistory; } @@ -166,16 +162,4 @@ public ObjectProperty mergeDiffModeProperty() { public void setMergeDiffMode(DiffMode mergeDiffMode) { this.mergeDiffMode.set(mergeDiffMode); } - - public double getSidePaneWidth() { - return sidePaneWidth.get(); - } - - public DoubleProperty sidePaneWidthProperty() { - return sidePaneWidth; - } - - public void setSidePaneWidth(double sidePaneWidth) { - this.sidePaneWidth.set(sidePaneWidth); - } } diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java index d204f2f8900..4b5bb5891f3 100644 --- a/src/main/java/org/jabref/preferences/JabRefPreferences.java +++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java @@ -662,7 +662,7 @@ private JabRefPreferences() { defaults.put(CITE_COMMAND, "\\cite"); // obsoleted by the app-specific ones (not any more?) defaults.put(LAST_USED_EXPORT, ""); - defaults.put(SIDE_PANE_WIDTH, 0.15); + defaults.put(SIDE_PANE_WIDTH, 300); defaults.put(MAIN_FONT_SIZE, 9); defaults.put(OVERRIDE_DEFAULT_FONT_SIZE, false); @@ -2481,14 +2481,15 @@ public SidePanePreferences getSidePanePreferences() { sidePanePreferences = new SidePanePreferences( getVisibleSidePanes(), getSidePanePreferredPositions(), - getInt(SELECTED_FETCHER_INDEX)); + getInt(SELECTED_FETCHER_INDEX), + getDouble(SIDE_PANE_WIDTH)); sidePanePreferences.visiblePanes().addListener((InvalidationListener) listener -> storeVisibleSidePanes(sidePanePreferences.visiblePanes())); sidePanePreferences.getPreferredPositions().addListener((InvalidationListener) listener -> storeSidePanePreferredPositions(sidePanePreferences.getPreferredPositions())); EasyBind.listen(sidePanePreferences.webSearchFetcherSelectedProperty(), (obs, oldValue, newValue) -> putInt(SELECTED_FETCHER_INDEX, newValue)); - + EasyBind.subscribe(sidePanePreferences.sidePaneWidthProperty(), width -> putDouble(SIDE_PANE_WIDTH, width.doubleValue())); return sidePanePreferences; } @@ -2567,8 +2568,7 @@ public GuiPreferences getGuiPreferences() { Path.of(get(LAST_FOCUSED)), getFileHistory(), get(ID_ENTRY_GENERATOR), - DiffMode.parse(get(MERGE_ENTRIES_DIFF_MODE)), - getDouble(SIDE_PANE_WIDTH)); + DiffMode.parse(get(MERGE_ENTRIES_DIFF_MODE))); EasyBind.listen(guiPreferences.positionXProperty(), (obs, oldValue, newValue) -> putDouble(POS_X, newValue.doubleValue())); EasyBind.listen(guiPreferences.positionYProperty(), (obs, oldValue, newValue) -> putDouble(POS_Y, newValue.doubleValue())); @@ -2587,7 +2587,6 @@ public GuiPreferences getGuiPreferences() { guiPreferences.getFileHistory().getHistory().addListener((InvalidationListener) change -> storeFileHistory(guiPreferences.getFileHistory())); EasyBind.listen(guiPreferences.lastSelectedIdBasedFetcherProperty(), (obs, oldValue, newValue) -> put(ID_ENTRY_GENERATOR, newValue)); EasyBind.listen(guiPreferences.mergeDiffModeProperty(), (obs, oldValue, newValue) -> put(MERGE_ENTRIES_DIFF_MODE, newValue.name())); - EasyBind.listen(guiPreferences.sidePaneWidthProperty(), (obs, oldValue, newValue) -> putDouble(SIDE_PANE_WIDTH, newValue.doubleValue())); return guiPreferences; } diff --git a/src/main/java/org/jabref/preferences/SidePanePreferences.java b/src/main/java/org/jabref/preferences/SidePanePreferences.java index 0cdbc3b52b2..cf0cc318f9e 100644 --- a/src/main/java/org/jabref/preferences/SidePanePreferences.java +++ b/src/main/java/org/jabref/preferences/SidePanePreferences.java @@ -3,7 +3,9 @@ import java.util.Map; import java.util.Set; +import javafx.beans.property.DoubleProperty; import javafx.beans.property.IntegerProperty; +import javafx.beans.property.SimpleDoubleProperty; import javafx.beans.property.SimpleIntegerProperty; import javafx.collections.FXCollections; import javafx.collections.ObservableMap; @@ -16,12 +18,16 @@ public class SidePanePreferences { private final ObservableMap preferredPositions; private final IntegerProperty webSearchFetcherSelected; + private final DoubleProperty sidePaneWidth; + public SidePanePreferences(Set visiblePanes, - Map preferredPositions, - int webSearchFetcherSelected) { + Map preferredPositions, + int webSearchFetcherSelected, + double sidePaneWidth) { this.visiblePanes = FXCollections.observableSet(visiblePanes); this.preferredPositions = FXCollections.observableMap(preferredPositions); this.webSearchFetcherSelected = new SimpleIntegerProperty(webSearchFetcherSelected); + this.sidePaneWidth = new SimpleDoubleProperty(sidePaneWidth); } public ObservableSet visiblePanes() { @@ -48,4 +54,16 @@ public IntegerProperty webSearchFetcherSelectedProperty() { public void setWebSearchFetcherSelected(int webSearchFetcherSelected) { this.webSearchFetcherSelected.set(webSearchFetcherSelected); } + + public DoubleProperty sidePaneWidthProperty() { + return sidePaneWidth; + } + + public double getSidePaneWidth() { + return sidePaneWidthProperty().get(); + } + + public void setSidePaneWidth(double width) { + sidePaneWidthProperty().set(width); + } } From f7902883a1f2dc9e2576a5feee5be1ba64496edf Mon Sep 17 00:00:00 2001 From: Houssem Nasri Date: Wed, 29 Jun 2022 01:29:48 +0100 Subject: [PATCH 5/9] Update CHANGELOG.md --- CHANGELOG.md | 1 + README.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bad6edb909..812b53665f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve - We fixed an issue where the exception that there are invalid characters in filename. [#8786](https://github.com/JabRef/jabref/issues/8786) - When the proxy configuration removed the proxy user/password, this change is applied immediately. - We fixed an issue where removing several groups deletes only one of them. [#8390](https://github.com/JabRef/jabref/issues/8390) +- We fixed an issue where Sidepane(groups, web search and open office) width is not remembered after restarting the app. [#8907](https://github.com/JabRef/jabref/issues/8907) ### Removed diff --git a/README.md b/README.md index 08b68588cfb..23cc6f637f6 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,6 @@ For IntelliJ IDEA, just import the project via a Gradle Import by pointing at th ## Sponsoring -JabRef development is by powered YourKit Java Profiler [![YourKit Java Profiler](https://www.yourkit.com/images/yk_logo.png)](https://www.yourkit.com/java/profiler/) +JabRef development is powered by YourKit Java Profiler [![YourKit Java Profiler](https://www.yourkit.com/images/yk_logo.png)](https://www.yourkit.com/java/profiler/) [JabRef]: https://www.jabref.org From 7fb0e3efe65a2cd9a99b11210c96257767e3dd37 Mon Sep 17 00:00:00 2001 From: Houssem Nasri Date: Wed, 29 Jun 2022 01:34:34 +0100 Subject: [PATCH 6/9] Fix failing tests --- .../java/org/jabref/gui/sidepane/SidePaneViewModelTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java index 03fb4dc6483..4b615661a3e 100644 --- a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java +++ b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java @@ -36,7 +36,7 @@ class SidePaneViewModelTest { DialogService dialogService = mock(DialogService.class); UndoManager undoManager = mock(UndoManager.class); - SidePanePreferences sidePanePreferences = new SidePanePreferences(new HashSet<>(), new HashMap<>(), 0); + SidePanePreferences sidePanePreferences = new SidePanePreferences(new HashSet<>(), new HashMap<>(), 0, 300); ObservableList sidePaneComponents = FXCollections.observableArrayList(); SidePaneViewModel sidePaneViewModel; From 5ad3923b59838c3d62ee0006867a0333f5d350c2 Mon Sep 17 00:00:00 2001 From: Houssem Nasri Date: Thu, 30 Jun 2022 08:05:45 +0100 Subject: [PATCH 7/9] Revert "Move sidePaneWidth from GuiPreferences to SidePanePreferences" This reverts commit a60d0e2ebacb19b640e6dcd29e0695b58c0367cd. --- src/main/java/org/jabref/gui/JabRefFrame.java | 4 ++-- .../jabref/preferences/GuiPreferences.java | 18 ++++++++++++++- .../jabref/preferences/JabRefPreferences.java | 11 +++++----- .../preferences/SidePanePreferences.java | 22 ++----------------- 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java index e11c9ed3637..91d074e7e7c 100644 --- a/src/main/java/org/jabref/gui/JabRefFrame.java +++ b/src/main/java/org/jabref/gui/JabRefFrame.java @@ -475,8 +475,8 @@ private void updateSidePane() { private void setDividerPosition() { if (mainStage.isShowing() && !sidePane.getChildren().isEmpty()) { - splitPane.setDividerPositions(prefs.getSidePanePreferences().getSidePaneWidth() / splitPane.getWidth()); - dividerSubscription = EasyBind.subscribe(sidePane.widthProperty(), width -> prefs.getSidePanePreferences().setSidePaneWidth(width.doubleValue())); + splitPane.setDividerPositions(prefs.getGuiPreferences().getSidePaneWidth() / splitPane.getWidth()); + dividerSubscription = EasyBind.subscribe(sidePane.widthProperty(), width -> prefs.getGuiPreferences().setSidePaneWidth(width.doubleValue())); } } diff --git a/src/main/java/org/jabref/preferences/GuiPreferences.java b/src/main/java/org/jabref/preferences/GuiPreferences.java index 62c5735effc..08f9e199c84 100644 --- a/src/main/java/org/jabref/preferences/GuiPreferences.java +++ b/src/main/java/org/jabref/preferences/GuiPreferences.java @@ -33,6 +33,8 @@ public class GuiPreferences { private final ObjectProperty mergeDiffMode; + private final DoubleProperty sidePaneWidth; + public GuiPreferences(double positionX, double positionY, double sizeX, @@ -42,7 +44,8 @@ public GuiPreferences(double positionX, Path lastFocusedFile, FileHistory fileHistory, String lastSelectedIdBasedFetcher, - DiffMode mergeDiffMode) { + DiffMode mergeDiffMode, + double sidePaneWidth) { this.positionX = new SimpleDoubleProperty(positionX); this.positionY = new SimpleDoubleProperty(positionY); this.sizeX = new SimpleDoubleProperty(sizeX); @@ -52,6 +55,7 @@ public GuiPreferences(double positionX, this.lastFocusedFile = new SimpleObjectProperty<>(lastFocusedFile); this.lastSelectedIdBasedFetcher = new SimpleStringProperty(lastSelectedIdBasedFetcher); this.mergeDiffMode = new SimpleObjectProperty<>(mergeDiffMode); + this.sidePaneWidth = new SimpleDoubleProperty(sidePaneWidth); this.fileHistory = fileHistory; } @@ -162,4 +166,16 @@ public ObjectProperty mergeDiffModeProperty() { public void setMergeDiffMode(DiffMode mergeDiffMode) { this.mergeDiffMode.set(mergeDiffMode); } + + public double getSidePaneWidth() { + return sidePaneWidth.get(); + } + + public DoubleProperty sidePaneWidthProperty() { + return sidePaneWidth; + } + + public void setSidePaneWidth(double sidePaneWidth) { + this.sidePaneWidth.set(sidePaneWidth); + } } diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java index 4b5bb5891f3..d204f2f8900 100644 --- a/src/main/java/org/jabref/preferences/JabRefPreferences.java +++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java @@ -662,7 +662,7 @@ private JabRefPreferences() { defaults.put(CITE_COMMAND, "\\cite"); // obsoleted by the app-specific ones (not any more?) defaults.put(LAST_USED_EXPORT, ""); - defaults.put(SIDE_PANE_WIDTH, 300); + defaults.put(SIDE_PANE_WIDTH, 0.15); defaults.put(MAIN_FONT_SIZE, 9); defaults.put(OVERRIDE_DEFAULT_FONT_SIZE, false); @@ -2481,15 +2481,14 @@ public SidePanePreferences getSidePanePreferences() { sidePanePreferences = new SidePanePreferences( getVisibleSidePanes(), getSidePanePreferredPositions(), - getInt(SELECTED_FETCHER_INDEX), - getDouble(SIDE_PANE_WIDTH)); + getInt(SELECTED_FETCHER_INDEX)); sidePanePreferences.visiblePanes().addListener((InvalidationListener) listener -> storeVisibleSidePanes(sidePanePreferences.visiblePanes())); sidePanePreferences.getPreferredPositions().addListener((InvalidationListener) listener -> storeSidePanePreferredPositions(sidePanePreferences.getPreferredPositions())); EasyBind.listen(sidePanePreferences.webSearchFetcherSelectedProperty(), (obs, oldValue, newValue) -> putInt(SELECTED_FETCHER_INDEX, newValue)); - EasyBind.subscribe(sidePanePreferences.sidePaneWidthProperty(), width -> putDouble(SIDE_PANE_WIDTH, width.doubleValue())); + return sidePanePreferences; } @@ -2568,7 +2567,8 @@ public GuiPreferences getGuiPreferences() { Path.of(get(LAST_FOCUSED)), getFileHistory(), get(ID_ENTRY_GENERATOR), - DiffMode.parse(get(MERGE_ENTRIES_DIFF_MODE))); + DiffMode.parse(get(MERGE_ENTRIES_DIFF_MODE)), + getDouble(SIDE_PANE_WIDTH)); EasyBind.listen(guiPreferences.positionXProperty(), (obs, oldValue, newValue) -> putDouble(POS_X, newValue.doubleValue())); EasyBind.listen(guiPreferences.positionYProperty(), (obs, oldValue, newValue) -> putDouble(POS_Y, newValue.doubleValue())); @@ -2587,6 +2587,7 @@ public GuiPreferences getGuiPreferences() { guiPreferences.getFileHistory().getHistory().addListener((InvalidationListener) change -> storeFileHistory(guiPreferences.getFileHistory())); EasyBind.listen(guiPreferences.lastSelectedIdBasedFetcherProperty(), (obs, oldValue, newValue) -> put(ID_ENTRY_GENERATOR, newValue)); EasyBind.listen(guiPreferences.mergeDiffModeProperty(), (obs, oldValue, newValue) -> put(MERGE_ENTRIES_DIFF_MODE, newValue.name())); + EasyBind.listen(guiPreferences.sidePaneWidthProperty(), (obs, oldValue, newValue) -> putDouble(SIDE_PANE_WIDTH, newValue.doubleValue())); return guiPreferences; } diff --git a/src/main/java/org/jabref/preferences/SidePanePreferences.java b/src/main/java/org/jabref/preferences/SidePanePreferences.java index cf0cc318f9e..0cdbc3b52b2 100644 --- a/src/main/java/org/jabref/preferences/SidePanePreferences.java +++ b/src/main/java/org/jabref/preferences/SidePanePreferences.java @@ -3,9 +3,7 @@ import java.util.Map; import java.util.Set; -import javafx.beans.property.DoubleProperty; import javafx.beans.property.IntegerProperty; -import javafx.beans.property.SimpleDoubleProperty; import javafx.beans.property.SimpleIntegerProperty; import javafx.collections.FXCollections; import javafx.collections.ObservableMap; @@ -18,16 +16,12 @@ public class SidePanePreferences { private final ObservableMap preferredPositions; private final IntegerProperty webSearchFetcherSelected; - private final DoubleProperty sidePaneWidth; - public SidePanePreferences(Set visiblePanes, - Map preferredPositions, - int webSearchFetcherSelected, - double sidePaneWidth) { + Map preferredPositions, + int webSearchFetcherSelected) { this.visiblePanes = FXCollections.observableSet(visiblePanes); this.preferredPositions = FXCollections.observableMap(preferredPositions); this.webSearchFetcherSelected = new SimpleIntegerProperty(webSearchFetcherSelected); - this.sidePaneWidth = new SimpleDoubleProperty(sidePaneWidth); } public ObservableSet visiblePanes() { @@ -54,16 +48,4 @@ public IntegerProperty webSearchFetcherSelectedProperty() { public void setWebSearchFetcherSelected(int webSearchFetcherSelected) { this.webSearchFetcherSelected.set(webSearchFetcherSelected); } - - public DoubleProperty sidePaneWidthProperty() { - return sidePaneWidth; - } - - public double getSidePaneWidth() { - return sidePaneWidthProperty().get(); - } - - public void setSidePaneWidth(double width) { - sidePaneWidthProperty().set(width); - } } From 4603b9ed8d598652ba6430dcf4b8d90745d192cf Mon Sep 17 00:00:00 2001 From: Houssem Nasri Date: Thu, 30 Jun 2022 08:05:55 +0100 Subject: [PATCH 8/9] Revert "Fix failing tests" This reverts commit 7fb0e3efe65a2cd9a99b11210c96257767e3dd37. --- .../java/org/jabref/gui/sidepane/SidePaneViewModelTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java index 4b615661a3e..03fb4dc6483 100644 --- a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java +++ b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java @@ -36,7 +36,7 @@ class SidePaneViewModelTest { DialogService dialogService = mock(DialogService.class); UndoManager undoManager = mock(UndoManager.class); - SidePanePreferences sidePanePreferences = new SidePanePreferences(new HashSet<>(), new HashMap<>(), 0, 300); + SidePanePreferences sidePanePreferences = new SidePanePreferences(new HashSet<>(), new HashMap<>(), 0); ObservableList sidePaneComponents = FXCollections.observableArrayList(); SidePaneViewModel sidePaneViewModel; From 80d551686efedb1072391a980a90d7351a880cec Mon Sep 17 00:00:00 2001 From: Houssem Nasri Date: Fri, 1 Jul 2022 21:50:36 +0100 Subject: [PATCH 9/9] Update CHANGELOG.md Co-authored-by: Christoph --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 812b53665f9..1afd5feb635 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,7 +46,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve - We fixed an issue where the exception that there are invalid characters in filename. [#8786](https://github.com/JabRef/jabref/issues/8786) - When the proxy configuration removed the proxy user/password, this change is applied immediately. - We fixed an issue where removing several groups deletes only one of them. [#8390](https://github.com/JabRef/jabref/issues/8390) -- We fixed an issue where Sidepane(groups, web search and open office) width is not remembered after restarting the app. [#8907](https://github.com/JabRef/jabref/issues/8907) +- We fixed an issue where the Sidepane(groups, web search and open office) width is not remembered after restarting JabRef. [#8907](https://github.com/JabRef/jabref/issues/8907) ### Removed