mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
paint dotted border over background filled areas, not the other way around.
This commit is contained in:
@@ -1,17 +1,17 @@
|
||||
/*
|
||||
* Copyright 2000-2007 JetBrains s.r.o.
|
||||
* Copyright 2000-2009 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.intellij.ui;
|
||||
|
||||
@@ -356,15 +356,7 @@ public class SimpleColoredComponent extends JComponent {
|
||||
xOffset = myIpad.left;
|
||||
}
|
||||
|
||||
// Paint focus border around the text and icon (if necessary)
|
||||
if (myPaintFocusBorder) {
|
||||
if (myFocusBorderAroundIcon || icon == null) {
|
||||
myBorder.paintBorder(this, g, 0, 0, getWidth(), getHeight());
|
||||
}
|
||||
else {
|
||||
myBorder.paintBorder(this, g, xOffset, 0, getWidth() - xOffset, getHeight());
|
||||
}
|
||||
}
|
||||
int textStart = xOffset;
|
||||
xOffset += myBorder.getBorderInsets(this).left;
|
||||
|
||||
// Paint text
|
||||
@@ -426,6 +418,16 @@ public class SimpleColoredComponent extends JComponent {
|
||||
xOffset = myAlignWidth;
|
||||
}
|
||||
}
|
||||
|
||||
// Paint focus border around the text and icon (if necessary)
|
||||
if (myPaintFocusBorder) {
|
||||
if (myFocusBorderAroundIcon || icon == null) {
|
||||
myBorder.paintBorder(this, g, 0, 0, getWidth(), getHeight());
|
||||
}
|
||||
else {
|
||||
myBorder.paintBorder(this, g, textStart, 0, getWidth() - textStart, getHeight());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static void checkCanPaint() {
|
||||
|
||||
Reference in New Issue
Block a user