fixed scrollpane jumping to the top after returning from detailview
* use plot=full to get a better description
This commit is contained in:
parent
5488bece2d
commit
9f8a7c0f4c
|
@ -158,6 +158,7 @@ public class MainWindowController {
|
||||||
// general actions
|
// general actions
|
||||||
HamburgerBackArrowBasicTransition burgerTask = new HamburgerBackArrowBasicTransition(menuHam);
|
HamburgerBackArrowBasicTransition burgerTask = new HamburgerBackArrowBasicTransition(menuHam);
|
||||||
menuHam.addEventHandler(MouseEvent.MOUSE_PRESSED, (e) -> {
|
menuHam.addEventHandler(MouseEvent.MOUSE_PRESSED, (e) -> {
|
||||||
|
|
||||||
if (menuTrue) {
|
if (menuTrue) {
|
||||||
sideMenuSlideOut();
|
sideMenuSlideOut();
|
||||||
burgerTask.setRate(-1.0);
|
burgerTask.setRate(-1.0);
|
||||||
|
@ -173,8 +174,7 @@ public class MainWindowController {
|
||||||
if (settingsViewController.isVisible()) {
|
if (settingsViewController.isVisible()) {
|
||||||
settingsViewController.setVisible(false);
|
settingsViewController.setVisible(false);
|
||||||
}
|
}
|
||||||
});primaryStage.setMinHeight(600.00 + 34); // 34 -> window decoration
|
});
|
||||||
primaryStage.setMinWidth(1130.00);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// general fxml actions
|
// general fxml actions
|
||||||
|
@ -296,7 +296,6 @@ public class MainWindowController {
|
||||||
|
|
||||||
// slide in in 400ms
|
// slide in in 400ms
|
||||||
private void sideMenuSlideIn() {
|
private void sideMenuSlideIn() {
|
||||||
sideMenuVBox.setVisible(true);
|
|
||||||
TranslateTransition translateTransition = new TranslateTransition(Duration.millis(400), sideMenuVBox);
|
TranslateTransition translateTransition = new TranslateTransition(Duration.millis(400), sideMenuVBox);
|
||||||
translateTransition.setFromX(-150);
|
translateTransition.setFromX(-150);
|
||||||
translateTransition.setToX(0);
|
translateTransition.setToX(0);
|
||||||
|
@ -374,7 +373,7 @@ public class MainWindowController {
|
||||||
ExecutorService executor = Executors.newFixedThreadPool(5);
|
ExecutorService executor = Executors.newFixedThreadPool(5);
|
||||||
|
|
||||||
for (FilmTabelDataType entry : dbController.getAllNotCachedEntries()) {
|
for (FilmTabelDataType entry : dbController.getAllNotCachedEntries()) {
|
||||||
System.out.println(entry.getStreamUrl() + " is NOT cached!");
|
// System.out.println(entry.getStreamUrl() + " is NOT cached!");
|
||||||
|
|
||||||
Runnable OMDbAPIWorker = new OMDbAPIController(entry);
|
Runnable OMDbAPIWorker = new OMDbAPIController(entry);
|
||||||
executor.execute(OMDbAPIWorker);
|
executor.execute(OMDbAPIWorker);
|
||||||
|
@ -432,7 +431,7 @@ public class MainWindowController {
|
||||||
|
|
||||||
for(FilmTabelDataType entry : dbController.getStreamsList()) {
|
for(FilmTabelDataType entry : dbController.getStreamsList()) {
|
||||||
if (dbController.getCacheDate(entry.getStreamUrl()).isBefore(lastValidCache)) {
|
if (dbController.getCacheDate(entry.getStreamUrl()).isBefore(lastValidCache)) {
|
||||||
System.out.println(entry.getTitle() + " chached on: " + dbController.getCacheDate(entry.getStreamUrl()));
|
// System.out.println(entry.getTitle() + " chached on: " + dbController.getCacheDate(entry.getStreamUrl()));
|
||||||
Runnable OMDbAPIWorker = new OMDbAPIController(entry);
|
Runnable OMDbAPIWorker = new OMDbAPIController(entry);
|
||||||
executor.execute(OMDbAPIWorker);
|
executor.execute(OMDbAPIWorker);
|
||||||
}
|
}
|
||||||
|
|
|
@ -165,10 +165,11 @@ public class OMDbAPIController implements Runnable {
|
||||||
apiUrl = new URL(URL + omdbAPIKey + "&t="
|
apiUrl = new URL(URL + omdbAPIKey + "&t="
|
||||||
+ title.replace(" ", "%20")
|
+ title.replace(" ", "%20")
|
||||||
+ "&Season=" + currentTableFilm.getSeason()
|
+ "&Season=" + currentTableFilm.getSeason()
|
||||||
+ "&Episode=" + currentTableFilm.getEpisode());
|
+ "&Episode=" + currentTableFilm.getEpisode()
|
||||||
|
+ "&plot=full");
|
||||||
} else {
|
} else {
|
||||||
apiUrl = new URL(URL + omdbAPIKey + "&t="
|
apiUrl = new URL(URL + omdbAPIKey + "&t="
|
||||||
+ title.replace(" ", "%20"));
|
+ title.replace(" ", "%20") + "&plot=full");
|
||||||
}
|
}
|
||||||
|
|
||||||
BufferedReader ina = new BufferedReader(new InputStreamReader(apiUrl.openStream()));
|
BufferedReader ina = new BufferedReader(new InputStreamReader(apiUrl.openStream()));
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
</JFXHamburger>
|
</JFXHamburger>
|
||||||
</children>
|
</children>
|
||||||
</HBox>
|
</HBox>
|
||||||
<VBox fx:id="sideMenuVBox" layoutY="32.0" prefHeight="660.0" prefWidth="150.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="32.0">
|
<VBox fx:id="sideMenuVBox" layoutX="-150.0" layoutY="32.0" prefHeight="660.0" prefWidth="150.0" AnchorPane.bottomAnchor="0.0" AnchorPane.topAnchor="32.0">
|
||||||
<children>
|
<children>
|
||||||
<JFXButton fx:id="aboutBtn" onAction="#aboutBtnAction" prefHeight="32.0" prefWidth="150.0" textAlignment="CENTER">
|
<JFXButton fx:id="aboutBtn" onAction="#aboutBtnAction" prefHeight="32.0" prefWidth="150.0" textAlignment="CENTER">
|
||||||
<font>
|
<font>
|
||||||
|
|
Loading…
Reference in New Issue