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.

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

Jump to bottom

Small improvements/fixes #1728

Merged
merged 13 commits into from Sep 27, 2018
Merged

Small improvements/fixes #1728

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a423f20
Update Genesis defaults, deactivate SnapshotManager, improve logs
ManfredKarrer Sep 26, 2018
0bf859e
Add shortcut to toggle tor logging
ManfredKarrer Sep 26, 2018
c11070f
Fixes assetMatchesNetwork method, rename method
ManfredKarrer Sep 26, 2018
4cd2688
Merge branch 'master' into DAO-improvements
ManfredKarrer Sep 26, 2018
c231750
Move classed from desktop to core
ManfredKarrer Sep 26, 2018
fd87ff3
Refactor and fix asset checks
ManfredKarrer Sep 26, 2018
fc5c0da
Fix wrong minDecimals for BSQ in trade volume display
ManfredKarrer Sep 27, 2018
2b6cf13
Close notifications onMousePressed event
ManfredKarrer Sep 27, 2018
97479e2
Fix wrong logging
ManfredKarrer Sep 27, 2018
8eabd66
Fix snapshot handling
ManfredKarrer Sep 27, 2018
dbe0993
Fix nullpointer
ManfredKarrer Sep 27, 2018
29193ad
Fix failing test
ManfredKarrer Sep 27, 2018
a9e32c0
Move maker classes back to desktop module
ManfredKarrer Sep 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 15 additions & 11 deletions desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java
View file
Open in desktop
Expand Up @@ -193,21 +193,25 @@ protected void onShow() {

public void hide() {
if (gridPane != null) {
animateHide(() -> {
removeEffectFromBackground();

if (stage != null)
stage.hide();
else
log.warn("Stage is null");

cleanup();
onHidden();
});
animateHide();
}
isDisplayed = false;
}

protected void animateHide() {
animateHide(() -> {
removeEffectFromBackground();

if (stage != null)
stage.hide();
else
log.warn("Stage is null");

cleanup();
onHidden();
});
}

protected void onHidden() {
}

Expand Down
12 changes: 1 addition & 11 deletions desktop/src/main/java/bisq/desktop/main/overlays/editor/PeerInfoWithTagEditor.java
View file
Open in desktop
Expand Up @@ -154,17 +154,7 @@ protected void onShow() {

@Override
public void hide() {
animateHide(() -> {
removeEffectFromBackground();

if (stage != null)
stage.hide();
else
log.warn("Stage is null");

cleanup();
onHidden();
});
animateHide();
}

@Override
Expand Down
18 changes: 7 additions & 11 deletions desktop/src/main/java/bisq/desktop/main/overlays/notifications/Notification.java
View file
Open in desktop
Expand Up @@ -34,6 +34,7 @@

import javafx.scene.Camera;
import javafx.scene.PerspectiveCamera;
import javafx.scene.input.MouseEvent;
import javafx.scene.transform.Rotate;

import javafx.geometry.Insets;
Expand All @@ -59,23 +60,18 @@ public Notification() {

public void onReadyForDisplay() {
super.display();

if (autoClose && autoCloseTimer == null)
autoCloseTimer = UserThread.runAfter(this::doClose, 6);

stage.addEventHandler(MouseEvent.MOUSE_PRESSED, (event) -> {
doClose();
});
}

@Override
public void hide() {
animateHide(() -> {
removeEffectFromBackground();

if (stage != null)
stage.hide();
else
log.warn("Stage is null");

cleanup();
onHidden();
});
animateHide();
}

@Override
Expand Down