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

[threading] IJPL-223870: Add write-intent into MergeWindow

Browse Source 
GitOrigin-RevId: be14ab3dfba1e8c4da33435b91919a325ba6fd3c
This commit is contained in:
Konstantin Nisht
2025-12-15 13:29:57 +00:00
committed by intellij-monorepo-bot
parent 360032dfd5
commit 98252655a7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/merge/MergeWindow.java
+3 -2
View File
@@ -1,10 +1,11 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.diff.merge;
import com.intellij.diff.DiffDialogHints;
import com.intellij.diff.util.DiffUserDataKeys;
import com.intellij.diff.util.DiffUtil;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.WriteIntentReadAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.WindowWrapper;
@@ -50,7 +51,7 @@ public abstract class MergeWindow {
.setDimensionServiceKey(dialogGroupKey)
.setInitialSize(JBUI.DialogSizes.extraLarge())
.setPreferredFocusedComponent(() -> myProcessor.getPreferredFocusedComponent())
.setOnShowCallback(() -> initProcessor(myProcessor))
.setOnShowCallback(() -> WriteIntentReadAction.run(() -> initProcessor(myProcessor)))
.setOnCloseHandler(() -> myProcessor.checkCloseAction())
.build();
myWrapper.setImages(DiffUtil.DIFF_FRAME_ICONS.getValue());