Skip to content

Minimize line #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sawka merged 4 commits into from
Aug 18, 2023
Merged

Minimize line #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cbb28e
enabled debugging
anandamarsh Aug 17, 2023
3164208
works but the change is too quisk. animation may be the right here
anandamarsh Aug 17, 2023
939e452
undid dev tools
anandamarsh Aug 18, 2023
21e6aad
reverted emain
anandamarsh Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 38 additions & 26 deletions src/linecomps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,12 @@ class LineCmd extends React.Component<{screen : LineContainerModel, line : LineT
rtnStateDiffFetched : boolean = false;
lastHeight : number;
isOverflow : OV<boolean> = mobx.observable.box(false, {name: "line-overflow"});
isMinimised : OV<boolean> = mobx.observable.box(false, {name: "line-minimised"});
Copy link
Copy Markdown
Member

@sawka sawka Aug 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix spelling :), "minimized"

isCmdExpanded : OV<boolean> = mobx.observable.box(false, {name: "cmd-expanded"});

constructor(props) {
super(props);

Copy link
Copy Markdown
Member

@sawka sawka Aug 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove extra line

}

checkStateDiffLoad() : void {
Expand Down Expand Up @@ -365,6 +367,11 @@ class LineCmd extends React.Component<{screen : LineContainerModel, line : LineT
GlobalCommandRunner.lineBookmark(line.lineid);
}

@boundMethod
clickMinimise() {
this.isMinimised.set(!this.isMinimised.get())
}

@boundMethod
handleResizeButton() {
console.log("resize button");
Expand Down Expand Up @@ -583,33 +590,38 @@ class LineCmd extends React.Component<{screen : LineContainerModel, line : LineT
<div key="bookmark" title="Bookmark" className={cn("line-icon", "line-bookmark")} onClick={this.clickBookmark}>
<i className="fa-sharp fa-regular fa-bookmark"/>
</div>
</div>
<If condition={rendererPlugin == null && !isNoneRenderer}>
<TerminalRenderer screen={screen} line={line} width={width} staticRender={staticRender} visible={visible} onHeightChange={this.handleHeightChange} collapsed={false}/>
</If>
<If condition={rendererPlugin != null && rendererPlugin.rendererType == "simple"}>
<SimpleBlobRenderer rendererContainer={screen} lineId={line.lineid} plugin={rendererPlugin} onHeightChange={this.handleHeightChange} initParams={this.makeRendererModelInitializeParams()}/>
</If>
<If condition={rendererPlugin != null && rendererPlugin.rendererType == "full"}>
<FullRenderer rendererContainer={screen} lineId={line.lineid} plugin={rendererPlugin} onHeightChange={this.handleHeightChange} initParams={this.makeRendererModelInitializeParams()}/>
</If>
<If condition={cmd.getRtnState()}>
<div key="rtnstate" className="cmd-rtnstate" style={{visibility: ((cmd.getStatus() == "done") ? "visible" : "hidden")}}>
<If condition={rsdiff == null || rsdiff == ""}>
<div className="cmd-rtnstate-label">state unchanged</div>
<div className="cmd-rtnstate-sep"></div>
</If>
<If condition={rsdiff != null && rsdiff != ""}>
<div className="cmd-rtnstate-label">new state</div>
<div className="cmd-rtnstate-sep"></div>
<div className="cmd-rtnstate-diff">{this.rtnStateDiff.get()}</div>
</If>
</div>
</If>
<If condition={isSelected && !isFocused && rendererType == "terminal"}>
<div className="cmd-hints">
<div className="hint-item color-nohover-white">focus line ({renderCmdText("L")})</div>
<div key="minimise" title={`${this.isMinimised.get() ? 'Maximise' : 'Minimise'}`} className={cn("line-icon", "line-minimise")} onClick={this.clickMinimise}>
<i className={`fa-sharp fa-regular ${this.isMinimised.get() ? 'fa-plus-circle' : 'fa-minus-circle'}`}/>
</div>
</div>
<If condition={!this.isMinimised.get()} >
<If condition={rendererPlugin == null && !isNoneRenderer}>
<TerminalRenderer screen={screen} line={line} width={width} staticRender={staticRender} visible={visible} onHeightChange={this.handleHeightChange} collapsed={false}/>
</If>
<If condition={rendererPlugin != null && rendererPlugin.rendererType == "simple"}>
<SimpleBlobRenderer rendererContainer={screen} lineId={line.lineid} plugin={rendererPlugin} onHeightChange={this.handleHeightChange} initParams={this.makeRendererModelInitializeParams()}/>
</If>
<If condition={rendererPlugin != null && rendererPlugin.rendererType == "full"}>
<FullRenderer rendererContainer={screen} lineId={line.lineid} plugin={rendererPlugin} onHeightChange={this.handleHeightChange} initParams={this.makeRendererModelInitializeParams()}/>
</If>
<If condition={cmd.getRtnState()}>
<div key="rtnstate" className="cmd-rtnstate" style={{visibility: ((cmd.getStatus() == "done") ? "visible" : "hidden")}}>
<If condition={rsdiff == null || rsdiff == ""}>
<div className="cmd-rtnstate-label">state unchanged</div>
<div className="cmd-rtnstate-sep"></div>
</If>
<If condition={rsdiff != null && rsdiff != ""}>
<div className="cmd-rtnstate-label">new state</div>
<div className="cmd-rtnstate-sep"></div>
<div className="cmd-rtnstate-diff">{this.rtnStateDiff.get()}</div>
</If>
</div>
</If>
<If condition={isSelected && !isFocused && rendererType == "terminal"}>
<div className="cmd-hints">
<div className="hint-item color-nohover-white">focus line ({renderCmdText("L")})</div>
</div>
</If>
</If>
</div>
);
Expand Down
4 changes: 4 additions & 0 deletions src/lines.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@
.line-bookmark:hover {
color: white;
}

.line-minimise:hover {
color: white;
}

.line-icon + .line-icon {
margin-left: 5px;
Expand Down