MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-174109 Rework Status bar: presentation mode

Browse Source 
GitOrigin-RevId: d9bc1cab12932f4cd75c26bea5c94e8fe20e73f1
This commit is contained in:
Alexander Lobas
2020-06-10 22:36:31 +03:00
committed by intellij-monorepo-bot
parent eafbb64131
commit 60fdd26cd6
5 changed files with 101 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java
+20 -4
View File
@@ -57,7 +57,7 @@ import java.util.*;
public final class InfoAndProgressPanel extends JPanel implements CustomStatusBarWidget {
private final ProcessPopup myPopup;
private final ProcessBalloon myBalloon = new ProcessBalloon();
private final ProcessBalloon myBalloon = new ProcessBalloon(3);
private final StatusPanel myInfoPanel = new StatusPanel();
private final JPanel myRefreshAndInfoPanel = new JPanel();
@@ -553,15 +553,15 @@ public final class InfoAndProgressPanel extends JPanel implements CustomStatusBa
public void updateProgressNow() {
super_updateProgressNow();
mySuspendUpdateRunnable.run();
boolean painting = getInfo().isCancellable() && !isStopping();
myCancelButton.setPainting(painting);
myCancelButton.setVisible(painting || !mySuspendButton.isVisible());
updateCancelButton(mySuspendButton, myCancelButton);
}
}
class MyInlineProgressIndicator extends InlineProgressIndicator {
private ProgressIndicatorEx myOriginal;
PresentationModeProgressPanel myPresentationModeProgressPanel;
Balloon myPresentationModeBalloon;
boolean myPresentationModeShowBalloon;
MyInlineProgressIndicator(@NotNull TaskInfo task, @NotNull ProgressIndicatorEx original) {
this(true, task, original);
@@ -605,6 +605,18 @@ public final class InfoAndProgressPanel extends JPanel implements CustomStatusBa
return JBIterable.of(createSuspendButton()).append(super.createEastButtons());
}
protected void updateCancelButton(@NotNull InplaceButton suspend, @NotNull InplaceButton cancel) {
boolean painting = getInfo().isCancellable() && !isStopping();
cancel.setPainting(painting);
cancel.setVisible(painting || !suspend.isVisible());
}
JBIterable<ProgressButton> createPresentationButtons() {
ProgressButton suspend = createSuspendButton();
ProgressButton cancel = createCancelButton();
return JBIterable.of(suspend).append(new ProgressButton(cancel.button, () -> updateCancelButton(suspend.button, cancel.button)));
}
private ProgressButton createSuspendButton() {
InplaceButton suspendButton = new InplaceButton("", AllIcons.Actions.Pause, e -> createSuspendRunnable().run()).setFillBg(false);
return new ProgressButton(suspendButton, createSuspendUpdateRunnable(suspendButton));
@@ -726,6 +738,10 @@ public final class InfoAndProgressPanel extends JPanel implements CustomStatusBa
super.updateProgressNow();
if (myPresentationModeProgressPanel != null) myPresentationModeProgressPanel.update();
}
public boolean showInPresentationMode() {
return !isProcessWindowOpen();
}
}
private void runQuery() {
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java
+1 -1
View File
@@ -122,7 +122,7 @@ public class InlineProgressIndicator extends ProgressIndicatorBase implements Di
return JBIterable.of(createCancelButton());
}
private ProgressButton createCancelButton() {
protected final ProgressButton createCancelButton() {
InplaceButton cancelButton = new InplaceButton(
new IconButton(myInfo.getCancelTooltipText(),
myCompact ? AllIcons.Process.StopSmall : AllIcons.Process.Stop,
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PresentationModeProgressPanel.java
+7 -3
View File
@@ -5,6 +5,7 @@ import com.intellij.ide.ui.UISettings;
import com.intellij.openapi.editor.colors.EditorColorsManager;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.wm.impl.status.InfoAndProgressPanel.MyInlineProgressIndicator;
import com.intellij.ui.TransparentPanel;
import com.intellij.ui.scale.JBUIScale;
import com.intellij.util.containers.JBIterable;
@@ -20,7 +21,7 @@ import java.awt.*;
* @author Konstantin Bulenkov
*/
public class PresentationModeProgressPanel {
private final InlineProgressIndicator myProgress;
private final MyInlineProgressIndicator myProgress;
private final JBIterable<ProgressButton> myEastButtons;
private JLabel myText;
private JProgressBar myProgressBar;
@@ -28,14 +29,14 @@ public class PresentationModeProgressPanel {
private JPanel myRootPanel;
private JPanel myButtonPanel;
public PresentationModeProgressPanel(@NotNull InlineProgressIndicator progress) {
public PresentationModeProgressPanel(@NotNull MyInlineProgressIndicator progress) {
myProgress = progress;
Font font = JBUI.Fonts.label(11);
myText.setFont(font);
myText2.setFont(font);
myText.setIcon(JBUI.scale(EmptyIcon.create(1, 16)));
myText2.setIcon(JBUI.scale(EmptyIcon.create(1, 16)));
myEastButtons = myProgress.createEastButtons();
myEastButtons = myProgress.createPresentationButtons();
myButtonPanel.add(InlineProgressIndicator.createButtonPanel(myEastButtons.map(b -> b.button)));
myRootPanel.setPreferredSize(new JBDimension(250, 60));
myProgressBar.setPreferredSize(new Dimension(JBUIScale.scale(250), myProgressBar.getPreferredSize().height));
@@ -79,6 +80,9 @@ public class PresentationModeProgressPanel {
myRootPanel = new TransparentPanel(0.5f) {
@Override
public boolean isVisible() {
if (!myProgress.showInPresentationMode()) {
return false;
}
UISettings ui = UISettings.getInstance();
return ui.getPresentationMode() || !ui.getShowStatusBar() && Registry.is("ide.show.progress.without.status.bar");
}
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ProcessBalloon.java
+71 -31
View File
@@ -28,39 +28,93 @@ import java.awt.*;
import java.util.ArrayList;
import java.util.List;
public class ProcessBalloon {
class ProcessBalloon {
private final List<MyInlineProgressIndicator> myIndicators = new ArrayList<>();
private final int myMaxVisible;
private int myVisible;
void addIndicator(@Nullable JRootPane pane, @NotNull MyInlineProgressIndicator indicator) {
if (pane == null) {
return;
}
ProcessBalloon(int visibleCount) {
myMaxVisible = visibleCount;
}
myIndicators.add(indicator);
if (myIndicators.size() == 1) {
public void addIndicator(@Nullable JRootPane pane, @NotNull MyInlineProgressIndicator indicator) {
if (pane != null) {
myIndicators.add(indicator);
show(pane);
}
}
void removeIndicator(@Nullable JRootPane pane, @NotNull MyInlineProgressIndicator indicator) {
public void removeIndicator(@Nullable JRootPane pane, @NotNull MyInlineProgressIndicator indicator) {
myIndicators.remove(indicator);
if (pane != null && indicator.myPresentationModeProgressPanel != null && !myIndicators.isEmpty()) {
show(pane);
if (indicator.myPresentationModeProgressPanel != null) {
myVisible--;
if (pane != null && !myIndicators.isEmpty()) {
show(pane);
}
}
}
private void show(@NotNull JRootPane pane) {
MyInlineProgressIndicator indicator = myIndicators.get(0);
List<MyInlineProgressIndicator> indicators = new ArrayList<>();
indicator.myPresentationModeProgressPanel = new PresentationModeProgressPanel(indicator);
indicator.updateProgressNow();
for (MyInlineProgressIndicator indicator : myIndicators) {
if (indicator.myPresentationModeProgressPanel == null) {
if (myVisible == myMaxVisible) {
continue;
}
show(pane, indicator, indicator.myPresentationModeProgressPanel.getProgressPanel());
myVisible++;
indicator.myPresentationModeProgressPanel = new PresentationModeProgressPanel(indicator);
indicator.updateProgressNow();
indicator.myPresentationModeBalloon = create(pane, indicator, indicator.myPresentationModeProgressPanel.getProgressPanel());
indicator.myPresentationModeShowBalloon = true;
indicators.add(indicator);
}
else if (!indicator.myPresentationModeBalloon.isDisposed()) {
indicators.add(indicator);
}
}
for (MyInlineProgressIndicator indicator : indicators) {
if (indicator.myPresentationModeShowBalloon) {
indicator.myPresentationModeShowBalloon = false;
indicator.myPresentationModeBalloon.show(new PositionTracker<Balloon>(getAnchor(pane)) {
@Override
public RelativePoint recalculateLocation(Balloon balloon) {
Component c = getAnchor(pane);
int y = c.getHeight() - JBUIScale.scale(45);
BalloonLayoutImpl balloonLayout = getBalloonLayout(pane);
if (balloonLayout != null && !isBottomSideToolWindowsVisible(pane)) {
Component component = balloonLayout.getTopBalloonComponent();
if (component != null) {
y = SwingUtilities.convertPoint(component, 0, -JBUIScale.scale(45), c).y;
}
}
if (myVisible > 1) {
int index = myIndicators.indexOf(indicator);
int rowHeight = balloon.getPreferredSize().height + JBUI.scale(5);
y -= rowHeight * (myVisible - index - 1);
}
return new RelativePoint(c, new Point(c.getWidth() - JBUIScale.scale(150), y));
}
}, Balloon.Position.above);
}
else {
indicator.myPresentationModeBalloon.revalidate();
}
}
}
private static void show(@NotNull JRootPane pane, @NotNull Disposable parentDisposable, @NotNull JComponent content) {
private static @NotNull Balloon create(@NotNull JRootPane pane, @NotNull Disposable parentDisposable, @NotNull JComponent content) {
Balloon balloon = JBPopupFactory.getInstance().createBalloonBuilder(content)
.setFadeoutTime(0)
.setFillColor(Gray.TRANSPARENT)
@@ -101,21 +155,7 @@ public class ProcessBalloon {
balloon.addListener(new MyListener());
}
balloon.show(new PositionTracker<Balloon>(getAnchor(pane)) {
@Override
public RelativePoint recalculateLocation(Balloon object) {
Component c = getAnchor(pane);
int y = c.getHeight() - JBUIScale.scale(45);
if (balloonLayout != null && !isBottomSideToolWindowsVisible(pane)) {
Component component = balloonLayout.getTopBalloonComponent();
if (component != null) {
y = SwingUtilities.convertPoint(component, 0, -JBUIScale.scale(45), c).y;
}
}
return new RelativePoint(c, new Point(c.getWidth() - JBUIScale.scale(150), y));
}
}, Balloon.Position.above);
return balloon;
}
private static @Nullable BalloonLayoutImpl getBalloonLayout(@NotNull JRootPane pane) {
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ProcessPopup.java
+2 -2
View File
@@ -27,7 +27,7 @@ import java.awt.*;
import static javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER;
import static javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED;
public class ProcessPopup {
class ProcessPopup {
public static final Key<ProgressPanel> KEY = new Key<>("ProgressPanel");
private final InfoAndProgressPanel myProgressPanel;
@@ -35,7 +35,7 @@ public class ProcessPopup {
private final JScrollPane myContentPanel;
private JBPopup myPopup;
public ProcessPopup(@NotNull InfoAndProgressPanel progressPanel) {
ProcessPopup(@NotNull InfoAndProgressPanel progressPanel) {
myProgressPanel = progressPanel;
myIndicatorPanel = new JBPanelWithEmptyText().withEmptyText(IdeBundle.message("progress.window.empty.text")).andTransparent();