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

always on top

Browse Source
This commit is contained in:
Dennis Ushakov
2015-12-28 20:27:30 +03:00
parent 63c4a0f546
commit 22bec0feb4
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ui/ColorPicker.java
+1 -2
View File
@@ -23,7 +23,6 @@ import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.util.Couple;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.wm.WindowManager;
import com.intellij.ui.picker.ColorListener;
@@ -162,7 +161,7 @@ public class ColorPicker extends JPanel implements ColorListener, DocumentListen
@Nullable
private ColorPipette createPipette(@NotNull ColorListener colorListener, @NotNull Disposable parentDisposable) {
if (SystemInfo.isMac && Registry.is("ide.mac.new.color.picker")) {
if (ColorPipetteBase.canUseMacPipette()) {
ColorPipette pipette = getPipetteIfAvailable(new MacColorPipette(this, colorListener), parentDisposable);
if (pipette != null) {
return pipette;
platform/platform-impl/src/com/intellij/ui/picker/ColorPipetteBase.java
+6 -1
View File
@@ -16,6 +16,7 @@
package com.intellij.ui.picker;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.util.Alarm;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
@@ -44,6 +45,10 @@ public abstract class ColorPipetteBase implements ColorPipette {
myRobot = createRobot();
}
public static boolean canUseMacPipette() {
return SystemInfo.isMac && Registry.is("ide.mac.new.color.picker");
}
@Override
public void pickAndClose() {
PointerInfo pointerInfo = MouseInfo.getPointerInfo();
@@ -142,7 +147,7 @@ public abstract class ColorPipetteBase implements ColorPipette {
});
myPickerFrame.setUndecorated(true);
myPickerFrame.setAlwaysOnTop(!SystemInfo.isJavaVersionAtLeast("1.8.0"));
myPickerFrame.setAlwaysOnTop(!SystemInfo.isJavaVersionAtLeast("1.8.0") || canUseMacPipette());
JRootPane rootPane = myPickerFrame.getRootPane();
rootPane.putClientProperty("Window.shadow", Boolean.FALSE);