seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IDEX-3819: Add smart auto-scroll to command's output. 

Signed-off-by: Dmitry Shnurenko <dshnurenko@codenvy.com>
6.19.x
Dmitry Shnurenko 2016-02-12 14:31:02 +02:00
parent 13076ed7b8
commit c73be50f5f
4 changed files with 46 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/outputspanel/console/CommandOutputConsolePresenter.java
View File

@ -113,7 +113,6 @@ public class CommandOutputConsolePresenter implements CommandOutputConsole, Outp
@Override
protected void onMessageReceived(String result) {
view.print(result, result.endsWith("\r"));
view.scrollBottom();
}
@Override
@ -159,7 +158,6 @@ public class CommandOutputConsolePresenter implements CommandOutputConsole, Outp
return;
}
view.print(error, false);
view.scrollBottom();
}
}

2
plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/outputspanel/console/DefaultOutputConsole.java
View File

@ -49,7 +49,6 @@ public class DefaultOutputConsole implements OutputConsole {
*/
public void printText(String text) {
view.print(text, text.endsWith("\r"));
view.scrollBottom();
}
/**
@ -68,7 +67,6 @@ public class DefaultOutputConsole implements OutputConsole {
}
view.print(text, isRepeat);
view.scrollBottom();
}
/** {@inheritDoc} */

3
plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/outputspanel/console/OutputConsoleView.java
View File

@ -36,9 +36,6 @@ public interface OutputConsoleView extends View<OutputConsoleView.ActionDelegate
*/
void print(String message, boolean cr);
/** Scrolls console to bottom. */
void scrollBottom();
/** Hides command title and command label */
void hideCommand();

92
plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/outputspanel/console/OutputConsoleViewImpl.java
View File

@ -12,13 +12,14 @@ package org.eclipse.che.ide.extension.machine.client.outputspanel.console;
import com.google.common.base.Strings;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.dom.client.Node;
import com.google.gwt.dom.client.PreElement;
import com.google.gwt.event.dom.client.MouseWheelEvent;
import com.google.gwt.event.dom.client.MouseWheelHandler;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.DockLayoutPanel;
import com.google.gwt.user.client.ui.FlowPanel;
@ -28,7 +29,7 @@ import com.google.gwt.user.client.ui.Widget;
import com.google.inject.Inject;
/**
* View for {@link OutputConsole}.
* View representation of output console.
*
* @author Artem Zatsarynnyi
*/
@ -37,48 +38,58 @@ public class OutputConsoleViewImpl extends Composite implements OutputConsoleVie
interface OutputConsoleViewUiBinder extends UiBinder<Widget, OutputConsoleViewImpl> {
}
private static final OutputConsoleViewUiBinder UI_BINDER = GWT.create(OutputConsoleViewUiBinder.class);
private ActionDelegate delegate;
private static final OutputConsoleViewUiBinder UI_BINDER = GWT.create(OutputConsoleViewUiBinder.class);
private static final int SCROLL_STEP = 3;
@UiField
DockLayoutPanel consolePanel;
@UiField
FlowPanel commandPanel;
FlowPanel commandPanel;
@UiField
FlowPanel previewPanel;
FlowPanel previewPanel;
@UiField
Label commandTitle;
Label commandTitle;
@UiField
Label commandLabel;
Label commandLabel;
@UiField
ScrollPanel scrollPanel;
ScrollPanel scrollPanel;
@UiField
FlowPanel consoleLines;
FlowPanel consoleLines;
@UiField
Anchor previewUrlLabel;
/** scroll events to the bottom if view is visible */
private boolean scrollBottomRequired = false;
Anchor previewUrlLabel;
/** If true - next printed line should replace the previous one. */
private boolean carriageReturn;
private int mouseDelta;
private int scrollLinesCount;
private boolean scrolled;
@Inject
public OutputConsoleViewImpl() {
initWidget(UI_BINDER.createAndBindUi(this));
MouseWheelHandler mouseWheelHandler = new MouseWheelHandler() {
@Override
public void onMouseWheel(MouseWheelEvent event) {
if (event.isNorth() && !scrolled) {
scrolled = true;
mouseDelta = scrollLinesCount;
}
mouseDelta += event.isSouth() ? SCROLL_STEP : -SCROLL_STEP;
if (mouseDelta < 0) {
mouseDelta = 0;
}
}
};
consoleLines.addDomHandler(mouseWheelHandler, MouseWheelEvent.getType());
}
@Override
public void setDelegate(ActionDelegate delegate) {
this.delegate = delegate;
}
@Override
@ -121,33 +132,22 @@ public class OutputConsoleViewImpl extends Composite implements OutputConsoleVie
PreElement pre = DOM.createElement("pre").cast();
pre.setInnerText(message.isEmpty() ? " " : message);
consoleLines.getElement().appendChild(pre);
scrollBottom();
}
@Override
public void scrollBottom() {
private void scrollBottom() {
/** scroll bottom immediately if view is visible */
if (scrollPanel.getElement().getOffsetParent() != null) {
if (mouseDelta >= scrollLinesCount) {
scrollPanel.scrollToBottom();
return;
scrolled = false;
mouseDelta = scrollLinesCount + SCROLL_STEP;
}
/** otherwise, check the visibility periodically and scroll the view when it's visible */
if (!scrollBottomRequired) {
scrollBottomRequired = true;
Scheduler.get().scheduleFixedPeriod(new Scheduler.RepeatingCommand() {
@Override
public boolean execute() {
if (scrollPanel.getElement().getOffsetParent() != null) {
scrollPanel.scrollToBottom();
scrollBottomRequired = false;
return false;
}
return true;
}
}, 1000);
if (!carriageReturn) {
scrollLinesCount++;
}
}
}
}