feat(studio): ship JavaFX 2 Play and delegate integration tooling
Launch the JavaFX 2 project shell on Java 25 with an interactive viewport, managed Play lifecycle and project mutation guards. Preserve headless/MCP and save compatibility, and qualify exact runtime executable bundles. Separate unit JaCoCo gates from opt-in integration suites and use the internal Pong fixture for the headless visual pilot. Move maintenance and native conformance tools into tooling; retain the VS Code extension and update current navigation links. Validation: tooling make verify passed, including 1064 Studio unit tests, JaCoCo thresholds and 22 headless integration tests.
This commit is contained in:
+1
-1
@@ -15,7 +15,7 @@ public final class ComponentGallery extends VBox {
|
||||
var typeface = new StudioSelect<>(context,"font.label",Typeface::family,Typeface.values());
|
||||
typeface.setId("font-select"); typeface.connect(() -> context.settings().typeface(), value -> context.update(context.settings().withTypeface(value)));
|
||||
var scale = new StudioSelect<>(context,"scale.label",value -> context.text("scale.value",value),.75,1.,1.25,1.5,2.);
|
||||
scale.setId("scale-select"); scale.connect(() -> context.settings().scale(), value -> context.update(context.settings().withScale(value)));
|
||||
scale.setId("gallery-scale-select"); scale.connect(() -> context.settings().scale(), value -> context.update(context.settings().withScale(value)));
|
||||
getChildren().add(new FlowPane(20,16,MinimalShell.labeled(context,"font.label",typeface),MinimalShell.labeled(context,"scale.label",scale)));
|
||||
StudioButton apply = new StudioButton(context,"action.apply",true); apply.setId("apply");
|
||||
StudioButton reset = new StudioButton(context,"action.reset",false); reset.setId("reset");
|
||||
|
||||
+78
@@ -0,0 +1,78 @@
|
||||
package p.studio.ui.javafx2.play;
|
||||
|
||||
import javafx.animation.AnimationTimer;
|
||||
import javafx.scene.control.ScrollPane;
|
||||
import javafx.scene.image.*;
|
||||
import javafx.scene.input.*;
|
||||
import javafx.scene.layout.*;
|
||||
import p.studio.api.execution.*;
|
||||
import java.util.*;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
/** Logical-pixel viewport. Reception never waits for the JavaFX pulse. */
|
||||
public final class PlaybackViewport extends BorderPane implements AutoCloseable {
|
||||
private final ImageView image=new ImageView();
|
||||
private final StackPane surface=new StackPane(image);
|
||||
private final Supplier<ExecutionController> controller;
|
||||
private final Supplier<ExecutionState> state;
|
||||
private final EnumSet<KeyCode> pressed=EnumSet.noneOf(KeyCode.class);
|
||||
private final AnimationTimer timer;
|
||||
private WritableImage writable;
|
||||
private int zoom=1,width=480,height=270,touchX=-1,touchY=-1;
|
||||
private boolean touching;
|
||||
private long painted,lastFrame;
|
||||
private final long[] latencies=new long[2048];
|
||||
private int latencyCount;
|
||||
public PlaybackViewport(Supplier<ExecutionController> controller,Supplier<ExecutionState> state) {
|
||||
this.controller=controller;this.state=state;setId("play-viewport");
|
||||
image.setId("game-image");image.setSmooth(false);image.setPreserveRatio(false);
|
||||
surface.setId("game-surface");surface.setFocusTraversable(true);surface.setStyle("-fx-background-color: #080a0a;");
|
||||
ScrollPane scroll=new ScrollPane(surface);scroll.setFitToWidth(true);scroll.setFitToHeight(true);setCenter(scroll);resizeImage();
|
||||
surface.addEventFilter(KeyEvent.KEY_PRESSED,e->key(e,true));
|
||||
surface.addEventFilter(KeyEvent.KEY_RELEASED,e->key(e,false));
|
||||
surface.focusedProperty().addListener((o,a,b)->{if(!b)neutralize();});
|
||||
image.setOnMousePressed(e->{surface.requestFocus();touch(e,true);});
|
||||
image.setOnMouseDragged(e->touch(e,true));
|
||||
surface.addEventFilter(MouseEvent.MOUSE_RELEASED,e->{if(e.getButton()==MouseButton.PRIMARY)touch(e,false);});
|
||||
timer=new AnimationTimer(){@Override public void handle(long now){paint();}};timer.start();
|
||||
}
|
||||
public void zoom(int value){if(value!=1&&value!=2&&value!=4)throw new IllegalArgumentException("Zoom");zoom=value;resizeImage();}
|
||||
public int zoom(){return zoom;}
|
||||
private void resizeImage(){image.setFitWidth(width*zoom);image.setFitHeight(height*zoom);surface.setMinSize(width*zoom,height*zoom);}
|
||||
private void paint(){
|
||||
ExecutionController c=controller.get();if(c==null)return;
|
||||
try(ExecutionFrame frame=c.acquireLatestFrame()){
|
||||
if(frame==null)return;
|
||||
if(writable==null||width!=frame.width()||height!=frame.height()){
|
||||
width=frame.width();height=frame.height();writable=new WritableImage(width,height);image.setImage(writable);resizeImage();
|
||||
}
|
||||
writable.getPixelWriter().setPixels(0,0,width,height,PixelFormat.getByteBgraPreInstance(),frame.pixels(),width*4);
|
||||
lastFrame=frame.frameId();painted++;latencies[latencyCount++%latencies.length]=System.nanoTime()-frame.receivedAtNanos();
|
||||
}
|
||||
}
|
||||
private void key(KeyEvent event,boolean down){
|
||||
if(bit(event.getCode())<0)return;
|
||||
if(event.isControlDown()||event.isMetaDown()||event.isAltDown()){neutralize();return;}
|
||||
if(down&&state.get()!=ExecutionState.RUNNING)return;
|
||||
if(down)pressed.add(event.getCode());else pressed.remove(event.getCode());send();event.consume();
|
||||
}
|
||||
private static int bit(KeyCode code){return switch(code){
|
||||
case UP->0;case DOWN->1;case LEFT->2;case RIGHT->3;case A->4;case D->5;case W->6;case S->7;
|
||||
case Q->8;case E->9;case Z->10;case SHIFT->11;default->-1;};}
|
||||
private void touch(MouseEvent event,boolean down){
|
||||
if(down&&!event.isPrimaryButtonDown())return;
|
||||
var p=image.sceneToLocal(event.getSceneX(),event.getSceneY());
|
||||
int x=(int)Math.floor(p.getX()/zoom),y=(int)Math.floor(p.getY()/zoom);
|
||||
touching=down&&state.get()==ExecutionState.RUNNING&&x>=0&&y>=0&&x<width&&y<height;
|
||||
touchX=touching?x:-1;touchY=touching?y:-1;send();event.consume();
|
||||
}
|
||||
private void send(){ExecutionController c=controller.get();if(c==null)return;
|
||||
int mask=0;for(KeyCode key:pressed)mask|=1<<bit(key);if(touching)mask|=1<<12;
|
||||
c.input(new ExecutionInput(mask,touchX,touchY));}
|
||||
public void neutralize(){pressed.clear();touching=false;touchX=touchY=-1;send();}
|
||||
public void focusGame(){surface.requestFocus();}
|
||||
public long paintedFrames(){return painted;}public long lastFrameId(){return lastFrame;}
|
||||
public double latencyP95Millis(){int n=Math.min(latencyCount,latencies.length);if(n==0)return 0;
|
||||
long[] sample=Arrays.copyOf(latencies,n);Arrays.sort(sample);return sample[(int)Math.ceil(n*.95)-1]/1_000_000.0;}
|
||||
@Override public void close(){timer.stop();neutralize();image.setImage(null);writable=null;}
|
||||
}
|
||||
+7
-2
@@ -9,7 +9,7 @@ import p.studio.ui.javafx2.appearance.*;
|
||||
import p.studio.ui.javafx2.components.*;
|
||||
import p.studio.ui.javafx2.i18n.StudioLanguage;
|
||||
|
||||
/** The product shell deliberately contains only identity, presentation selectors and empty working space. */
|
||||
/** Shared shell: identity, presentation selectors and a workspace supplied by its coordinator. */
|
||||
public final class MinimalShell extends BorderPane {
|
||||
private final StudioPanel workspace = new StudioPanel();
|
||||
private final StudioSelect<Theme> theme;
|
||||
@@ -20,8 +20,13 @@ public final class MinimalShell extends BorderPane {
|
||||
theme.setId("theme-select"); theme.connect(() -> context.settings().theme(), value -> context.update(context.settings().withTheme(value)));
|
||||
language = new StudioSelect<>(context,"language.label",StudioLanguage::label,StudioLanguage.values());
|
||||
language.setId("language-select"); language.connect(() -> context.settings().language(), value -> context.update(context.settings().withLanguage(value)));
|
||||
var typeface=new StudioSelect<Typeface>(context,"font.label",Typeface::family,Typeface.values());
|
||||
typeface.setId("typeface-select");typeface.connect(()->context.settings().typeface(),value->context.update(context.settings().withTypeface(value)));
|
||||
var scale=new StudioSelect<Double>(context,"scale.label",value->context.text("scale.value",value),.75,1.0,1.25,1.5,2.0);
|
||||
scale.setId("scale-select");scale.connect(()->context.settings().scale(),value->context.update(context.settings().withScale(value)));
|
||||
HBox identity = new HBox(12,new StudioIcon(),new StudioText(context,"brand").title()); identity.setAlignment(Pos.CENTER_LEFT);
|
||||
FlowPane selectors = new FlowPane(18,14,labeled(context,"theme.label",theme),labeled(context,"language.label",language));
|
||||
FlowPane selectors = new FlowPane(18,14,labeled(context,"theme.label",theme),labeled(context,"language.label",language),
|
||||
labeled(context,"font.label",typeface),labeled(context,"scale.label",scale));
|
||||
selectors.setPrefWrapLength(680);
|
||||
PresentationToolbar toolbar = new PresentationToolbar(identity,selectors);
|
||||
setTop(toolbar); workspace.setId("empty-workspace"); workspace.getStyleClass().add("workspace");
|
||||
|
||||
+226
@@ -0,0 +1,226 @@
|
||||
package p.studio.ui.javafx2.window;
|
||||
|
||||
import javafx.animation.AnimationTimer;
|
||||
import javafx.application.Platform;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.scene.Scene;
|
||||
import javafx.scene.control.*;
|
||||
import javafx.scene.layout.*;
|
||||
import javafx.stage.*;
|
||||
import p.studio.api.execution.*;
|
||||
import p.studio.api.project.*;
|
||||
import p.studio.api.session.*;
|
||||
import p.studio.ui.javafx2.appearance.AppearanceContext;
|
||||
import p.studio.ui.javafx2.components.*;
|
||||
import p.studio.ui.javafx2.play.PlaybackViewport;
|
||||
import p.studio.ui.javafx2.shell.MinimalShell;
|
||||
import java.nio.file.Path;
|
||||
import java.util.concurrent.*;
|
||||
import java.util.function.*;
|
||||
|
||||
/** The normal Studio product: one project and one owned interactive execution. */
|
||||
public final class StudioWindowCoordinator2 implements AutoCloseable {
|
||||
private final Stage stage;
|
||||
private final ProjectCatalog catalog;
|
||||
private final KnownProjects known;
|
||||
private final ProjectSessionFactory sessions;
|
||||
private final ExecutionControllerFactory executions;
|
||||
private final BiConsumer<ProjectReference,ProjectLocalStudioSetup> saveSetup;
|
||||
private final Executor executor;
|
||||
private final WindowResources resources;
|
||||
private final AppearanceContext context;
|
||||
private AppearanceContext viewContext;
|
||||
private final MinimalShell shell;
|
||||
private final Label notice=new Label();
|
||||
private final AnimationTimer lifecycle;
|
||||
private ProjectSession project;
|
||||
private ExecutionController controller;
|
||||
private PlaybackViewport viewport;
|
||||
private VBox configuration;
|
||||
private StudioTextField runtimePath,savePath;
|
||||
private CheckBox disposable;
|
||||
private Button play,pause,resume,stop,closeProject;
|
||||
private Label stateLabel;
|
||||
private TextArea logs;
|
||||
private long lastLog=-1;
|
||||
private long operationSequence;
|
||||
private ExecutionState displayedState;
|
||||
private boolean busy,closing,projectCloseRequested,exitRequested,closed,focusPauseArmed;
|
||||
|
||||
public StudioWindowCoordinator2(Stage stage,ProjectCatalog catalog,KnownProjects known,ProjectSessionFactory sessions,
|
||||
ExecutionControllerFactory executions,BiConsumer<ProjectReference,ProjectLocalStudioSetup> saveSetup,
|
||||
Executor executor,WindowResources resources) {
|
||||
this.stage=stage;this.catalog=catalog;this.known=known;this.sessions=sessions;this.executions=executions;
|
||||
this.saveSetup=saveSetup;this.executor=executor;this.resources=resources;
|
||||
context=resources.context();shell=new MinimalShell(context);notice.setWrapText(true);notice.setId("studio-notice");
|
||||
context.observe(()->shell.workspace().setAccessibleText(project==null?context.text("projects.title"):project.projectReference().name()));
|
||||
shell.setBottom(notice);BorderPane.setMargin(notice,new Insets(10,18,12,18));
|
||||
stage.setScene(new Scene(shell,1200,850));stage.setTitle("Prometeu Studio");stage.setMinWidth(680);stage.setMinHeight(480);
|
||||
stage.setOnCloseRequest(e->{e.consume();exitRequested=true;requestCloseProject();});
|
||||
stage.iconifiedProperty().addListener((o,a,b)->{if(b)pauseForFocus();});
|
||||
lifecycle=new AnimationTimer(){long previous;@Override public void handle(long now){
|
||||
if(now-previous<100_000_000)return;previous=now;
|
||||
boolean ours=Window.getWindows().stream().anyMatch(w->w.isFocused()&&belongsToStudio(w));
|
||||
if(!ours)pauseForFocus();else focusPauseArmed=false;
|
||||
refresh();
|
||||
}};lifecycle.start();
|
||||
}
|
||||
public void showLauncher(){showChooser();stage.show();}
|
||||
private boolean belongsToStudio(Window window){
|
||||
if(window==stage)return true;
|
||||
if(window instanceof Stage s&&s.getOwner()!=null)return belongsToStudio(s.getOwner());
|
||||
return window instanceof PopupWindow p&&p.getOwnerWindow()!=null&&belongsToStudio(p.getOwnerWindow());
|
||||
}
|
||||
private AppearanceContext beginView(){
|
||||
if(viewport!=null){viewport.close();viewport=null;}
|
||||
if(viewContext!=null)viewContext.close();viewContext=resources.child(context);return viewContext;
|
||||
}
|
||||
private Button button(AppearanceContext c,String key,String id,Runnable action){
|
||||
Button b=new StudioButton(c,key,false);b.setId(id);b.setOnAction(e->safe(action));return b;
|
||||
}
|
||||
private void safe(Runnable action){try{action.run();}catch(RuntimeException failure){error(failure);}}
|
||||
private void error(Throwable failure){while(failure instanceof CompletionException&&failure.getCause()!=null)failure=failure.getCause();
|
||||
notice.setText(failure.getMessage()==null?failure.getClass().getSimpleName():failure.getMessage());}
|
||||
private <T> void background(Supplier<T> work,BiConsumer<T,Throwable> result){
|
||||
CompletableFuture.supplyAsync(work,executor).whenComplete((value,failure)->Platform.runLater(()->{if(!closed)result.accept(value,failure);}));
|
||||
}
|
||||
private void showChooser(){
|
||||
var c=beginView();shell.workspace().setAccessibleText(c.text("projects.title"));
|
||||
VBox content=new VBox(14,new StudioText(c,"projects.title").title());content.setPadding(new Insets(20));
|
||||
content.getChildren().add(button(c,"projects.open","open-project",()->{
|
||||
DirectoryChooser chooser=new DirectoryChooser();chooser.setTitle(c.text("projects.open"));
|
||||
var selected=chooser.showDialog(stage);if(selected!=null)openProject(selected.toPath());
|
||||
}));
|
||||
VBox rows=new VBox(12);content.getChildren().add(rows);
|
||||
ScrollPane scroll=new ScrollPane(content);scroll.setFitToWidth(true);shell.workspace().getChildren().setAll(scroll);
|
||||
background(known::listKnownProjects,(list,failure)->{
|
||||
if(viewContext!=c||project!=null)return;if(failure!=null){error(failure);return;}
|
||||
for(ProjectReference ref:list){
|
||||
Label title=new Label(ref.name()+"\n"+ref.rootPath());title.setWrapText(true);HBox.setHgrow(title,Priority.ALWAYS);
|
||||
var row=new HBox(16,title,button(c,"projects.open","known-open",()->openProject(ref.rootPath())),
|
||||
button(c,"projects.forget","known-forget",()->{
|
||||
if(busy)return;busy=true;background(()->{known.forget(ref);return true;},(v,f)->{
|
||||
busy=false;if(exitRequested)finishExit();else if(f!=null)error(f);else showChooser();});
|
||||
}));row.setPadding(new Insets(14));rows.getChildren().add(new StudioPanel(row));
|
||||
}
|
||||
});
|
||||
}
|
||||
public void openProject(Path path){
|
||||
if(busy||project!=null||closing)return;busy=true;notice.setText(context.text("feedback.busy"));
|
||||
background(()->{var ref=catalog.openProject(path);var opened=sessions.openForPlay(ref);
|
||||
try{known.remember(ref);return opened;}catch(RuntimeException f){opened.close();throw f;}},(opened,failure)->{
|
||||
busy=false;if(failure!=null){error(failure);projectCloseRequested=false;if(exitRequested)finishExit();return;}
|
||||
project=opened;notice.setText("");showProject();if(exitRequested||projectCloseRequested)requestCloseProject();
|
||||
});
|
||||
}
|
||||
private void showProject(){
|
||||
var c=beginView();var ref=project.projectReference();var setup=project.projectLocalStudioSetup();
|
||||
shell.workspace().setAccessibleText(ref.name());
|
||||
Label title=new Label(ref.name());title.getStyleClass().add("studio-title");HBox.setHgrow(title,Priority.ALWAYS);
|
||||
closeProject=button(c,"projects.close","close-project",this::requestCloseProject);
|
||||
HBox heading=new HBox(18,title,closeProject);
|
||||
runtimePath=new StudioTextField();runtimePath.setId("runtime-path");runtimePath.setText(setup.prometeuRuntimePath());
|
||||
Button browseRuntime=button(c,"play.browse","runtime-browse",()->{
|
||||
DirectoryChooser chooser=new DirectoryChooser();var chosen=chooser.showDialog(stage);if(chosen!=null)runtimePath.setText(chosen.getAbsolutePath());});
|
||||
HBox runtimeRow=new HBox(12,runtimePath,browseRuntime);HBox.setHgrow(runtimePath,Priority.ALWAYS);
|
||||
configuration=new VBox(8,MinimalShell.labeled(c,"play.runtime",runtimeRow));
|
||||
disposable=new CheckBox();c.bindText(disposable,"play.disposable");disposable.setId("disposable-save");
|
||||
savePath=new StudioTextField();savePath.setId("memcard-path");savePath.setText(setup.memcardPath());
|
||||
if(ref.memcardSlots()!=null){
|
||||
Button browseSave=button(c,"play.browse","memcard-browse",()->{
|
||||
FileChooser chooser=new FileChooser();var chosen=chooser.showOpenDialog(stage);if(chosen!=null){savePath.setText(chosen.getAbsolutePath());disposable.setSelected(false);}});
|
||||
HBox row=new HBox(12,savePath,browseSave);HBox.setHgrow(savePath,Priority.ALWAYS);
|
||||
disposable.selectedProperty().addListener((o,a,b)->row.setDisable(b));
|
||||
configuration.getChildren().addAll(MinimalShell.labeled(c,"play.memcard",row),disposable);
|
||||
}
|
||||
play=button(c,"play.start","play",this::play);
|
||||
pause=button(c,"play.pause","pause",()->{viewport.neutralize();observe(controller.pause().completion());});
|
||||
resume=button(c,"play.resume","resume",()->{observe(controller.resume().completion());viewport.focusGame();});
|
||||
stop=button(c,"play.stop","stop",()->{viewport.neutralize();observe(controller.stopAsync());});
|
||||
StudioSelect<Integer> zoom=new StudioSelect<>(c,"play.zoom",n->"x"+n,1,2,4);zoom.setId("viewport-zoom");zoom.setValue(1);
|
||||
viewport=new PlaybackViewport(()->controller,()->project.executionSession().snapshot().state());
|
||||
zoom.setOnAction(e->{if(zoom.getValue()!=null)viewport.zoom(zoom.getValue());});
|
||||
stateLabel=new Label();stateLabel.setId("execution-state");
|
||||
c.observe(()->{displayedState=null;refresh();});
|
||||
FlowPane controls=new FlowPane(12,10,play,pause,resume,stop,zoom,stateLabel);
|
||||
logs=new TextArea();logs.setId("execution-logs");logs.setEditable(false);logs.setPrefRowCount(4);logs.setWrapText(true);
|
||||
VBox top=new VBox(14,heading,configuration,controls);top.setPadding(new Insets(16));
|
||||
BorderPane body=new BorderPane(viewport,top,null,logs,null);body.setId("project-play");
|
||||
shell.workspace().getChildren().setAll(body);lastLog=-1;refresh();
|
||||
}
|
||||
private void play(){
|
||||
if(busy||closing||controller!=null&&controller.ownsExecution())return;
|
||||
var original=project.projectLocalStudioSetup();var ref=project.projectReference();
|
||||
String runtime=runtimePath.getText();if(runtime==null||runtime.isBlank())throw new IllegalArgumentException(context.text("play.runtime.required"));
|
||||
boolean discard=ref.memcardSlots()!=null&&disposable.isSelected();
|
||||
if(ref.memcardSlots()!=null&&!discard&&(savePath.getText()==null||savePath.getText().isBlank()))
|
||||
throw new IllegalArgumentException(context.text("play.memcard.required"));
|
||||
var setup=new ProjectLocalStudioSetup(runtime,original.editorIndentation(),original.agentIntegration(),savePath.getText());
|
||||
busy=true;refresh();notice.setText("");
|
||||
background(()->{saveSetup.accept(ref,setup);return setup;},(saved,failure)->{
|
||||
busy=false;if(failure!=null){error(failure);if(exitRequested||projectCloseRequested)requestCloseProject();return;}
|
||||
if(closing||exitRequested||projectCloseRequested){requestCloseProject();return;}
|
||||
safe(()->{if(controller!=null)controller.close();
|
||||
controller=executions.create(ref,saved,project.executionSession(),new PlayOptions(discard));
|
||||
observe(controller.play().completion());viewport.focusGame();
|
||||
if(stage.isIconified()||!Window.getWindows().stream().anyMatch(w->w.isFocused()&&belongsToStudio(w)))pauseForFocus();refresh();});
|
||||
});
|
||||
}
|
||||
private void observe(CompletionStage<?> operation){
|
||||
ProjectSession originProject=project;ExecutionController originController=controller;
|
||||
long command=++operationSequence;
|
||||
operation.whenComplete((v,f)->Platform.runLater(()->{
|
||||
if(!closed&&project==originProject&&controller==originController&&command==operationSequence){
|
||||
if(f!=null)error(f);refresh();
|
||||
}
|
||||
}));
|
||||
}
|
||||
private void pauseForFocus(){
|
||||
if(controller==null||project==null)return;
|
||||
if(viewport!=null)viewport.neutralize();
|
||||
ExecutionState state=project.executionSession().snapshot().state();
|
||||
if(focusPauseArmed&&(state==ExecutionState.PREPARING||state==ExecutionState.CONNECTING))return;
|
||||
if(state==ExecutionState.RUNNING||state==ExecutionState.PREPARING||state==ExecutionState.CONNECTING)
|
||||
safe(()->{focusPauseArmed=true;observe(controller.pause().completion());});
|
||||
}
|
||||
private void refresh(){
|
||||
if(project==null||play==null||closed)return;
|
||||
var snapshot=project.executionSession().snapshot();var state=snapshot.state();boolean owned=controller!=null&&controller.ownsExecution();
|
||||
configuration.setDisable(busy||closing||owned);configuration.setVisible(!owned);configuration.setManaged(!owned);
|
||||
play.setDisable(busy||closing||owned);
|
||||
pause.setDisable(closing||state!=ExecutionState.RUNNING);resume.setDisable(closing||state!=ExecutionState.PAUSED);
|
||||
stop.setDisable(closing||!owned||state==ExecutionState.STOPPING);closeProject.setDisable(closing);
|
||||
if(displayedState!=state){displayedState=state;stateLabel.setText(viewContext.text("state."+state.name()));
|
||||
if(state!=ExecutionState.RUNNING&&viewport!=null)viewport.neutralize();}
|
||||
long sequence=snapshot.logs().isEmpty()?0:snapshot.logs().getLast().sequence();
|
||||
if(logs!=null&&lastLog!=sequence){lastLog=sequence;StringBuilder text=new StringBuilder();
|
||||
int start=Math.max(0,snapshot.logs().size()-300);
|
||||
for(var entry:snapshot.logs().subList(start,snapshot.logs().size()))text.append(entry.severity()).append(" · ").append(entry.message()).append('\n');
|
||||
logs.setText(text.toString());logs.positionCaret(logs.getLength());}
|
||||
}
|
||||
public void requestCloseProject(){
|
||||
if(closed||closing)return;
|
||||
projectCloseRequested=true;
|
||||
if(busy){if(exitRequested)notice.setText(context.text("feedback.busy"));return;}
|
||||
if(project==null){projectCloseRequested=false;if(exitRequested)finishExit();return;}
|
||||
closing=true;refresh();if(viewport!=null)viewport.neutralize();
|
||||
CompletionStage<Void> stopping=controller==null?CompletableFuture.completedFuture(null):controller.stopAsync();
|
||||
stopping.whenComplete((v,f)->Platform.runLater(()->{
|
||||
if(f!=null){closing=false;exitRequested=false;projectCloseRequested=false;error(f);refresh();return;}
|
||||
var oldProject=project;var oldController=controller;
|
||||
background(()->{if(oldController!=null)oldController.close();oldProject.close();return true;},(done,failure)->{
|
||||
if(failure!=null){closing=false;exitRequested=false;projectCloseRequested=false;error(failure);refresh();return;}
|
||||
project=null;controller=null;closing=false;projectCloseRequested=false;play=null;notice.setText("");
|
||||
if(exitRequested)finishExit();else showChooser();
|
||||
});
|
||||
}));
|
||||
}
|
||||
private void finishExit(){close();stage.hide();Platform.exit();}
|
||||
public PlaybackViewport viewport(){return viewport;}
|
||||
public ProjectSession projectSession(){return project;}
|
||||
@Override public void close(){
|
||||
if(closed)return;closed=true;lifecycle.stop();if(viewport!=null)viewport.close();
|
||||
if(controller!=null)controller.close();if(project!=null)project.close();
|
||||
if(viewContext!=null)viewContext.close();context.close();resources.close();stage.setOnCloseRequest(null);
|
||||
}
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
package p.studio.ui.javafx2.window;
|
||||
|
||||
import p.studio.ui.javafx2.appearance.*;
|
||||
import p.studio.ui.javafx2.i18n.Messages;
|
||||
import p.studio.ui.javafx2.preferences.*;
|
||||
import java.util.Locale;
|
||||
import java.util.prefs.Preferences;
|
||||
|
||||
/** Loaded before opening the window; preferences and font I/O stay off the FX thread. */
|
||||
public final class WindowResources implements AutoCloseable {
|
||||
private final PresentationSettings initial;
|
||||
private final FontResources fonts;
|
||||
private final Messages messages;
|
||||
private final SettingsPersistence persistence;
|
||||
public WindowResources() {
|
||||
var store=new UserSettingsStore(Preferences.userRoot().node("p/studio/ui/javafx2"),Locale.getDefault(),System.err::println);
|
||||
initial=store.load();persistence=new SettingsPersistence(store);
|
||||
fonts=FontResources.load(System.err::println);messages=Messages.load(System.err::println);
|
||||
}
|
||||
public AppearanceContext context(){return new AppearanceContext(initial,messages,fonts,persistence::changed);}
|
||||
public AppearanceContext child(AppearanceContext parent){
|
||||
var child=new AppearanceContext(parent.settings(),messages,fonts,parent::update);
|
||||
javafx.beans.value.ChangeListener<PresentationSettings> listener=(o,a,b)->child.update(b);
|
||||
parent.settingsProperty().addListener(listener);
|
||||
child.onClose(()->parent.settingsProperty().removeListener(listener));
|
||||
return child;
|
||||
}
|
||||
@Override public void close(){persistence.close();}
|
||||
}
|
||||
+26
@@ -1,4 +1,30 @@
|
||||
brand=prometeu studio
|
||||
projects.title=PROJECTS
|
||||
projects.open=Open project
|
||||
projects.forget=Forget
|
||||
projects.close=Close project
|
||||
play.runtime=Runtime installation
|
||||
play.browse=Browse…
|
||||
play.memcard=Development save media
|
||||
play.disposable=Disposable session · changes will not be saved
|
||||
play.runtime.required=Choose a runtime installation before Play.
|
||||
play.memcard.required=Select existing save media or explicitly choose a disposable session.
|
||||
play.start=Play
|
||||
play.pause=Pause
|
||||
play.resume=Resume
|
||||
play.stop=Stop
|
||||
play.zoom=Zoom
|
||||
state.IDLE=Ready
|
||||
state.PREPARING=Preparing…
|
||||
state.PREPARE_FAILED=Preparation failed
|
||||
state.CONNECTING=Connecting…
|
||||
state.RUNNING=Playing
|
||||
state.PAUSING=Pausing…
|
||||
state.PAUSED=Paused · Resume to continue
|
||||
state.RESUMING=Resuming…
|
||||
state.STOPPING=Stopping…
|
||||
state.RUNTIME_FAILED=Runtime failed · see logs
|
||||
state.STOPPED=Stopped
|
||||
theme.label=Theme
|
||||
theme.dark=Bananodore · dark
|
||||
theme.light=Bananodore · light
|
||||
|
||||
+26
@@ -1,4 +1,30 @@
|
||||
brand=prometeu studio
|
||||
projects.title=PROJETOS
|
||||
projects.open=Abrir projeto
|
||||
projects.forget=Esquecer
|
||||
projects.close=Fechar projeto
|
||||
play.runtime=Instalação do runtime
|
||||
play.browse=Procurar…
|
||||
play.memcard=Mídia de save para desenvolvimento
|
||||
play.disposable=Sessão descartável · alterações não serão salvas
|
||||
play.runtime.required=Escolha uma instalação do runtime antes de jogar.
|
||||
play.memcard.required=Selecione uma mídia de save existente ou escolha explicitamente uma sessão descartável.
|
||||
play.start=Play
|
||||
play.pause=Pause
|
||||
play.resume=Resume
|
||||
play.stop=Stop
|
||||
play.zoom=Zoom
|
||||
state.IDLE=Pronto
|
||||
state.PREPARING=Preparando…
|
||||
state.PREPARE_FAILED=Falha na preparação
|
||||
state.CONNECTING=Conectando…
|
||||
state.RUNNING=Jogando
|
||||
state.PAUSING=Pausando…
|
||||
state.PAUSED=Pausado · Resume para continuar
|
||||
state.RESUMING=Retomando…
|
||||
state.STOPPING=Encerrando…
|
||||
state.RUNTIME_FAILED=Falha no runtime · consulte os logs
|
||||
state.STOPPED=Encerrado
|
||||
theme.label=Tema
|
||||
theme.dark=Bananodore · escuro
|
||||
theme.light=Bananodore · claro
|
||||
|
||||
+1
@@ -26,6 +26,7 @@ import java.util.concurrent.*;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
/** Opt-in real toolkit contract tests. No backend, game project, or personal preference writes. */
|
||||
@org.junit.jupiter.api.Tag("integration")
|
||||
class FoundationDesktopTest {
|
||||
private static FontResources fonts;
|
||||
private static Messages messages;
|
||||
|
||||
Reference in New Issue
Block a user