Improving detaching tabs by eatpasta02 · Pull Request #5 · PWrInSpace/SouRCE

eatpasta02 · 2026-02-19T18:10:02Z

Now tabs can be detached between windows

modified: src/main/java/pl/edu/pwr/pwrinspace/poliwrocket/Controller/DetachedTabController.java
few changes, logic the same

modified:   src/main/java/pl/edu/pwr/pwrinspace/poliwrocket/Controller/MainController.java

added methods for detaching tabs - setupDetachedWindowsProvider, configureTabContextMenu,detachTabToNewWindow , and changed the warning in findAndStyleTiles

created:    src/main/java/pl/edu/pwr/pwrinspace/poliwrocket/Provider/DetachedWindowsProvider.java

added a class used for managing all active tab panes, has a method for transfering tabs

modified:   src/main/resources/Views/DetachedTabView.fxml

added TabPane

modified:   src/main/resources/Views/constants.css

changes for ContextMenu

modified:   src/main/resources/Views/constantsLight.css

changes for ContextMenu

…DetachedTabController.java used for scaling detached window new file: src/main/resources/Views/DetachedTabView.fxml new View with an empty anchorPane modified: src/main/java/pl/edu/pwr/pwrinspace/poliwrocket/Controller/MainController.java added methods responsible for detaching tab (detaching and detachTab) and calling detaching in initialize() and methods responsible for changing mode to light or dark(applyStyleToNode, findAndStyleTiles, applyTileStyle, applyGaugeStyle) and using them in invalidated() modified: src/main/java/pl/edu/pwr/pwrinspace/poliwrocket/Controller/SettingsController.java added method onToggleLightMode that uses Configuration modified: src/main/java/pl/edu/pwr/pwrinspace/poliwrocket/Main.java not adding DetachedTabView to loaders modified: src/main/java/pl/edu/pwr/pwrinspace/poliwrocket/Model/Configuration/Configuration.java adding field lightMode and method setLightMode to use observable in MainController modified: src/main/resources/Views/SettingsView.fxml added toggle button to switch between modes(light dark) modified: src/main/resources/Views/constants.css new file: src/main/resources/Views/constantsLight.css to switch between css when changing mode(light dark)

…wanie taba z glownego okna, usuniecie linijki z readme(z path javafx), ustawienie glownego okna na caly ekran

…/DetachedTabController.java few changes, logic the same modified: src/main/java/pl/edu/pwr/pwrinspace/poliwrocket/Controller/MainController.java added methods for detaching tabs - setupDetachedWindowsProvider, configureTabContextMenu,detachTabToNewWindow , and changed the warning in findAndStyleTiles created: src/main/java/pl/edu/pwr/pwrinspace/poliwrocket/Provider/DetachedWindowsProvider.java added a class used for managing all active tab panes, has a method for transfering tabs modified: src/main/resources/Views/DetachedTabView.fxml added TabPane modified: src/main/resources/Views/constants.css changes for ContextMenu modified: src/main/resources/Views/constantsLight.css changes for ContextMenu

kasprzakewa · 2026-03-16T07:22:22Z

src/main/java/pl/edu/pwr/pwrinspace/poliwrocket/Controller/MainController.java

        for (Node n : root.getChildrenUnmodifiable()) {
            if (n instanceof Tile) {
                Tile tile = (Tile) n;
                applyTileStyle(tile, bg, fg);
-            }else if (n instanceof Gauge){
+            }else if (n instanceof Gauge) {
                Gauge gauge = (Gauge) n;
                applyGaugeStyle(gauge, fg);
-            }else{
-                System.out.println("Node ignored for styling: " + n.getClass().getSimpleName());
+            }if (n.getClass().getName().startsWith("pl.edu.pwr") &&
+                    !(n instanceof Tile || n instanceof Gauge || n instanceof Parent)) {
+                System.out.println("Unpredicted node ignored for styling:: " + n.getClass().getSimpleName());
            }
        }


Można tutaj dodać końcowe else

kasprzakewa · 2026-03-16T07:23:49Z

src/main/java/pl/edu/pwr/pwrinspace/poliwrocket/Provider/DetachedWindowsProvider.java

+            targetIndex = (int) tab.getUserData();
+        }
+
+        sourceTabPane.getTabs().remove(tab);


Dodajmy sprawdzenie czy sourceTabPane nie jest null

kasprzakewa · 2026-03-16T07:24:34Z

src/main/resources/Views/DetachedTabView.fxml

@@ -8,4 +8,8 @@

 <AnchorPane fx:id="rootPane" maxHeight="-1.0" maxWidth="-1.0" prefHeight="1080.0" prefWidth="1920.0" style="-fx-background-image: url('background.jpg'); -fx-background-size: stretch; -fx-background-color: grey;" stylesheets="@constants.css" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="pl.edu.pwr.pwrinspace.poliwrocket.Controller.DetachedTabController">


Tutaj mamy troszkę inne wymiary sceny niż w controllerze

kasprzakewa · 2026-03-16T07:25:25Z

src/main/java/pl/edu/pwr/pwrinspace/poliwrocket/Controller/DetachedTabController.java

    private static final double initWidth = 1550.4;
    private static final double initHeight = 838.4;


Mamy już 2 miejsca, w ktorych pojawiaja się te wartości. Można zrobić wspólne miejsce do jej przechowywania

kasprzakewa · 2026-03-16T08:10:49Z

src/main/resources/Views/constantsLight.css

 .jfx-button {
    -jfx-button-type: FLAT;
    -fx-background-color: -inspace-base-border-color;
    -fx-text-fill: black;
 }

 /*Raised button example */
 .jfx-button {
    -jfx-button-type: RAISED;
    -fx-background-color: -inspace-base-border-color;
    -fx-text-fill: black;
 }


Jak to działa, że mamy 2 różne przyciski, które tak samo się nazywaja?

kasprzakewa · 2026-03-16T08:12:06Z

src/main/java/pl/edu/pwr/pwrinspace/poliwrocket/Controller/MainController.java

+        if (tabPane != null) {
+            DetachedWindowsProvider.addActiveTabPane(tabPane);
+        }
+        for(int i = 0; i < Objects.requireNonNull(tabPane).getTabs().size(); i++) {


Można to wciągnąc pod pierwszego ifa, który właśnie sprawdza czy tabPane nie jest nullem i na koniec dodać else jakiś z informacja o tym, ze tabPane jest nullem

kasprzakewa · 2026-03-16T08:12:45Z

src/main/java/pl/edu/pwr/pwrinspace/poliwrocket/Provider/DetachedWindowsProvider.java

+        }else{
+            targetTabPane.getTabs().add(tab);
+        }
+        targetTabPane.setTabClosingPolicy(TabPane.TabClosingPolicy.UNAVAILABLE);


A czemu tak robimy?

kasprzakewa

Kilka uwag i pytań + do rozwiązania konflikty

eatpasta02 added 6 commits January 11, 2026 22:40

drobne poprawki przy wygladzie(usuniecie dodawania tla na Gauge), usu…

b1ef184

…wanie taba z glownego okna, usuniecie linijki z readme(z path javafx), ustawienie glownego okna na caly ekran

deleting mistakenly added line

559ed83

final small changes

6b56dd3

eatpasta02 requested a review from kasprzakewa February 19, 2026 18:10

kasprzakewa reviewed Mar 16, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improving detaching tabs#5

Improving detaching tabs#5
eatpasta02 wants to merge 6 commits intorecruitment-2026from
improving-detaching-tabs

eatpasta02 commented Feb 19, 2026

Uh oh!

kasprzakewa Mar 16, 2026

Uh oh!

kasprzakewa Mar 16, 2026

Uh oh!

kasprzakewa Mar 16, 2026

Uh oh!

kasprzakewa Mar 16, 2026

Uh oh!

kasprzakewa Mar 16, 2026

Uh oh!

kasprzakewa Mar 16, 2026

Uh oh!

kasprzakewa Mar 16, 2026

Uh oh!

kasprzakewa left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		@@ -8,4 +8,8 @@

		<AnchorPane fx:id="rootPane" maxHeight="-1.0" maxWidth="-1.0" prefHeight="1080.0" prefWidth="1920.0" style="-fx-background-image: url('background.jpg'); -fx-background-size: stretch; -fx-background-color: grey;" stylesheets="@constants.css" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="pl.edu.pwr.pwrinspace.poliwrocket.Controller.DetachedTabController">

		private static final double initWidth = 1550.4;
		private static final double initHeight = 838.4;

Conversation

eatpasta02 commented Feb 19, 2026

Uh oh!

kasprzakewa Mar 16, 2026

Choose a reason for hiding this comment

Uh oh!

kasprzakewa Mar 16, 2026

Choose a reason for hiding this comment

Uh oh!

kasprzakewa Mar 16, 2026

Choose a reason for hiding this comment

Uh oh!

kasprzakewa Mar 16, 2026

Choose a reason for hiding this comment

Uh oh!

kasprzakewa Mar 16, 2026

Choose a reason for hiding this comment

Uh oh!

kasprzakewa Mar 16, 2026

Choose a reason for hiding this comment

Uh oh!

kasprzakewa Mar 16, 2026

Choose a reason for hiding this comment

Uh oh!

kasprzakewa left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants