beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-21 23:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small fixes

Browse source
This commit is contained in:
crschnick 2024-10-03 00:38:03 +00:00
parent 86a9383cd2
commit 55b7021a18
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/io/xpipe/app/core/window/NativeWinWindowControl.java
View file

@ -65,6 +65,12 @@ public class NativeWinWindowControl {
this.windowHandle = windowHandle;
}
public void removeBorders() {
var style = User32.INSTANCE.GetWindowLong(windowHandle, User32.GWL_STYLE);
var mod = style & ~(User32.WS_CAPTION | User32.WS_THICKFRAME | User32.WS_MAXIMIZEBOX);
User32.INSTANCE.SetWindowLong(windowHandle,User32.GWL_STYLE,mod);
}
public boolean isIconified() {
return (User32.INSTANCE.GetWindowLong(windowHandle,User32.GWL_STYLE) & User32.WS_MINIMIZE) != 0;
}
@ -74,7 +80,7 @@ public class NativeWinWindowControl {
}
public void defaultOrder() {
orderRelative(new WinDef.HWND(new Pointer( 1)));
orderRelative(new WinDef.HWND(new Pointer( -2)));
}
public void orderRelative(WinDef.HWND predecessor) {

27
app/src/main/java/io/xpipe/app/util/TerminalView.java
View file

@ -4,6 +4,7 @@ import io.xpipe.app.core.AppLayoutModel;
import io.xpipe.app.core.window.NativeWinWindowControl;
import io.xpipe.app.issue.TrackEvent;
import io.xpipe.app.prefs.AppPrefs;
import io.xpipe.app.terminal.ExternalTerminalType;
import io.xpipe.core.process.OsType;
import javafx.application.Platform;
import lombok.AccessLevel;
@ -94,7 +95,8 @@ public class TerminalView {
@Override
public void back() {
control.defaultOrder();
// NativeWinWindowControl.MAIN_WINDOW.orderRelative(control.getWindowHandle());
NativeWinWindowControl.MAIN_WINDOW.alwaysInFront();
NativeWinWindowControl.MAIN_WINDOW.defaultOrder();
}
@Override
@ -141,7 +143,7 @@ public class TerminalView {
return;
}
var terminal = shell.get().parent();
var terminal = isTerminalShell() ? shell : shell.get().parent();
if (terminal.isEmpty()) {
return;
}
@ -174,6 +176,15 @@ public class TerminalView {
});
}
private boolean isTerminalShell() {
var t = AppPrefs.get().terminalType().getValue();
if (t.equals(ExternalTerminalType.CMD) || t.equals(ExternalTerminalType.POWERSHELL) || t.equals(ExternalTerminalType.PWSH)) {
return true;
} else {
return false;
}
}
public synchronized void tick() {
sessions.removeIf(session -> !session.shell.isAlive() || !session.terminal.isAlive());
for (TerminalInstance terminalInstance : new ArrayList<>(terminalInstances)) {
@ -203,6 +214,10 @@ public class TerminalView {
}
public synchronized void onFocusGain() {
if (!viewActive) {
return;
}
TrackEvent.withTrace("Terminal view focus gained")
.handle();
terminalInstances.forEach(terminalInstance -> {
@ -220,6 +235,10 @@ public class TerminalView {
}
public synchronized void onWindowActivate() {
if (!viewActive) {
return;
}
TrackEvent.withTrace("Terminal view focus gained")
.handle();
terminalInstances.forEach(terminalInstance -> {
@ -233,6 +252,10 @@ public class TerminalView {
}
public synchronized void onWindowMinimize() {
if (!viewActive) {
return;
}
TrackEvent.withTrace("Terminal view minimized")
.handle();