Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-30 03:23:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1504 from danielyxie/dev

Browse Source 
@hydroflame logbox window z index fix
This commit is contained in:
hydroflame 2021-10-15 13:49:25 -04:00 committed by GitHub
commit 3d0c76b81b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.bundle.js
View File

File diff suppressed because one or more lines are too long

2
main.bundle.js.map
View File

File diff suppressed because one or more lines are too long

13
src/ui/React/LogBoxManager.tsx
View File

@ -11,6 +11,7 @@ import { ResizableBox } from "react-resizable";
import makeStyles from "@mui/styles/makeStyles"; import makeStyles from "@mui/styles/makeStyles";
import createStyles from "@mui/styles/createStyles"; import createStyles from "@mui/styles/createStyles";
import ArrowForwardIosIcon from "@mui/icons-material/ArrowForwardIos"; import ArrowForwardIosIcon from "@mui/icons-material/ArrowForwardIos";
import _ from "lodash";
export const LogBoxEvents = new EventEmitter<[RunningScript]>(); export const LogBoxEvents = new EventEmitter<[RunningScript]>();
@ -86,9 +87,17 @@ function LogWindow(props: IProps): React.ReactElement {
killWorkerScript(props.script, props.script.server, true); killWorkerScript(props.script, props.script.server, true);
props.onClose(); props.onClose();
} }
//useEffect(() => TerminalEvents.subscribe(_.debounce(async () => rerender(), 25, { maxWait: 50 })), []);
function onDrag(): void {
const c = container.current;
if (c === null) return;
c.style.zIndex = (new Date().getTime() % 1000000) + "";
rerender();
}
return ( return (
<Draggable handle="#drag"> <Draggable onDrag={onDrag} handle=".drag">
<Paper <Paper
style={{ style={{
display: "flex", display: "flex",
@ -105,7 +114,7 @@ function LogWindow(props: IProps): React.ReactElement {
cursor: "grab", cursor: "grab",
}} }}
> >
<Box id="drag" display="flex" alignItems="center"> <Box className="drag" display="flex" alignItems="center">
<Typography color="primary" variant="h6"> <Typography color="primary" variant="h6">
{props.script.filename} {props.script.args.map((x: any): string => `${x}`).join(" ")} {props.script.filename} {props.script.args.map((x: any): string => `${x}`).join(" ")}
</Typography> </Typography>