From 0b932966c5d7599bd844c7a0b6f02708e61a2419 Mon Sep 17 00:00:00 2001 From: paulmart-n Date: Wed, 15 May 2024 13:08:18 +0200 Subject: [PATCH] Styling --- .../pic16f84/Controller_Frontend.java | 18 ++++++++++++++---- .../fabrik/simulator/pic16f84/frontend.fxml | 3 +-- .../fabrik/simulator/pic16f84/styles.css | 1 - 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/main/java/fabrik/simulator/pic16f84/Controller_Frontend.java b/src/main/java/fabrik/simulator/pic16f84/Controller_Frontend.java index f03ab20..3a9498c 100644 --- a/src/main/java/fabrik/simulator/pic16f84/Controller_Frontend.java +++ b/src/main/java/fabrik/simulator/pic16f84/Controller_Frontend.java @@ -136,8 +136,12 @@ public class Controller_Frontend { return; } + int currentIndex; // Aktuelle Zeile abrufen - int currentIndex = ind[DataRegister.getPC()]; + if (!isSleeping) + currentIndex = ind[DataRegister.getPC()]; + else + currentIndex = ind[DataRegister.getPC()]-1; // Scrollen zur ausgewählten Zeile lstContentListView.scrollTo(currentIndex -2); @@ -146,7 +150,11 @@ public class Controller_Frontend { lstContentListView.getSelectionModel().clearSelection(); lstContentListView.getSelectionModel().select(currentIndex); - String selectedRowStyle = "-fx-control-inner-background: red;"; + String selectedRowStyle; + if (!isSleeping) + selectedRowStyle = "-fx-background-color: red;"; + else + selectedRowStyle = "-fx-background-color: teal;"; lstContentListView.setCellFactory(column -> new ListCell() { @Override protected void updateItem(String item, boolean empty) { @@ -165,14 +173,16 @@ public class Controller_Frontend { Commands.decode(prog[DataRegister.getPC()]); DataRegister.increasePC(); } - else + else { Commands.decode(0); + + } WatchdogTimer.testAndTrigger(); Table.refresh(); Stage stage = (Stage) stepintoButton.getScene().getWindow(); CreateWindow.refreshTable(stage); IOPorts.refreshUI(getTRISbuttons(), getPORTbuttons()); - totalExecutionTimeLabel.setText("Total Execution Time: " + Commands.getTotalExecutionTime() + " µs"); + totalExecutionTimeLabel.setText("Total Execution Time: " + Commands.getTotalExecutionTime() + "µs"); } diff --git a/src/main/resources/fabrik/simulator/pic16f84/frontend.fxml b/src/main/resources/fabrik/simulator/pic16f84/frontend.fxml index ae6abd3..742265a 100644 --- a/src/main/resources/fabrik/simulator/pic16f84/frontend.fxml +++ b/src/main/resources/fabrik/simulator/pic16f84/frontend.fxml @@ -46,8 +46,7 @@ - -