mirror of
https://gitflic.ru/project/openide/openide.git
synced 2025-12-15 11:53:49 +07:00
Revert "KTNB-1022: Actualize the grid toolbar explicitly"
This reverts commit ca92883aad4b1b7714b6bf4bd5c3a478504b0dfe. GitOrigin-RevId: bef9bbc24d0bf58f0d84020e9e862c621465da1e
This commit is contained in:
committed by
intellij-monorepo-bot
parent
d7228cc515
commit
4680895573
@@ -68,7 +68,6 @@ import com.intellij.psi.CommonClassNames;
|
|||||||
import com.intellij.psi.PsiElement;
|
import com.intellij.psi.PsiElement;
|
||||||
import com.intellij.psi.SingleRootFileViewProvider;
|
import com.intellij.psi.SingleRootFileViewProvider;
|
||||||
import com.intellij.testFramework.LightVirtualFile;
|
import com.intellij.testFramework.LightVirtualFile;
|
||||||
import com.intellij.ui.AppUIUtil;
|
|
||||||
import com.intellij.ui.ClientProperty;
|
import com.intellij.ui.ClientProperty;
|
||||||
import com.intellij.ui.ExperimentalUI;
|
import com.intellij.ui.ExperimentalUI;
|
||||||
import com.intellij.ui.TextFieldWithAutoCompletion;
|
import com.intellij.ui.TextFieldWithAutoCompletion;
|
||||||
@@ -806,10 +805,6 @@ public class GridUtil extends GridUtilCore {
|
|||||||
ActionManager actionManager = ActionManager.getInstance();
|
ActionManager actionManager = ActionManager.getInstance();
|
||||||
ActionToolbar toolbar = actionManager.createActionToolbar(ActionPlaces.EDITOR_TOOLBAR, actions, true);
|
ActionToolbar toolbar = actionManager.createActionToolbar(ActionPlaces.EDITOR_TOOLBAR, actions, true);
|
||||||
ActionToolbar toolbarSecondary = actionManager.createActionToolbar(ActionPlaces.EDITOR_TOOLBAR, secondaryActions, true);
|
ActionToolbar toolbarSecondary = actionManager.createActionToolbar(ActionPlaces.EDITOR_TOOLBAR, secondaryActions, true);
|
||||||
|
|
||||||
addToolbarActualizer(dataGrid, toolbar);
|
|
||||||
addToolbarActualizer(dataGrid, toolbarSecondary);
|
|
||||||
|
|
||||||
toolbar.setTargetComponent(dataGrid.getPanel().getComponent());
|
toolbar.setTargetComponent(dataGrid.getPanel().getComponent());
|
||||||
toolbarSecondary.setTargetComponent(dataGrid.getPanel().getComponent());
|
toolbarSecondary.setTargetComponent(dataGrid.getPanel().getComponent());
|
||||||
toolbarSecondary.setReservePlaceAutoPopupIcon(false);
|
toolbarSecondary.setReservePlaceAutoPopupIcon(false);
|
||||||
@@ -833,29 +828,6 @@ public class GridUtil extends GridUtilCore {
|
|||||||
return header;
|
return header;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void addToolbarActualizer(
|
|
||||||
@NotNull DataGrid dataGrid,
|
|
||||||
@NotNull ActionToolbar toolbar
|
|
||||||
) {
|
|
||||||
var pageModel = dataGrid.getDataHookup().getPageModel();
|
|
||||||
if (pageModel instanceof MultiPageModel<GridRow, GridColumn> multiPageModel) {
|
|
||||||
multiPageModel.addPageModelListener(
|
|
||||||
new MultiPageModel.PageModelListener() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void pageSizeChanged() {
|
|
||||||
AppUIUtil.invokeOnEdt(() -> {
|
|
||||||
toolbar.updateActionsAsync();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void pageStartChanged() {}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static @NotNull JComponent addVerticalGridHeaderComponent(@NotNull DataGrid dataGrid, @Nullable String actionGroupName) {
|
public static @NotNull JComponent addVerticalGridHeaderComponent(@NotNull DataGrid dataGrid, @Nullable String actionGroupName) {
|
||||||
ActionManager actionManager = ActionManager.getInstance();
|
ActionManager actionManager = ActionManager.getInstance();
|
||||||
ActionGroup actions = actionGroupName == null ? new EmptyActionGroup() : (ActionGroup)actionManager.getAction(actionGroupName);
|
ActionGroup actions = actionGroupName == null ? new EmptyActionGroup() : (ActionGroup)actionManager.getAction(actionGroupName);
|
||||||
|
|||||||
Reference in New Issue
Block a user