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-149395 use opaque scroll bars for all tables

Browse Source 
This fix also reverts hacks added to some tables
This commit is contained in:
Sergey Malenkov
2016-01-27 22:09:00 +03:00
parent c117b495d1
commit ba75fc2c4d
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/InspectionsConfigTreeTable.java
+2 -4
View File
@@ -29,7 +29,6 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.profile.codeInspection.ui.InspectionsAggregationUtil;
import com.intellij.profile.codeInspection.ui.SingleInspectionProfilePanel;
@@ -37,7 +36,6 @@ import com.intellij.profile.codeInspection.ui.ToolDescriptors;
import com.intellij.profile.codeInspection.ui.table.ScopesAndSeveritiesTable;
import com.intellij.profile.codeInspection.ui.table.ThreeStateCheckBoxRenderer;
import com.intellij.ui.DoubleClickListener;
import com.intellij.ui.TableUtil;
import com.intellij.ui.treeStructure.treetable.TreeTable;
import com.intellij.ui.treeStructure.treetable.TreeTableModel;
import com.intellij.ui.treeStructure.treetable.TreeTableTree;
@@ -74,7 +72,7 @@ public class InspectionsConfigTreeTable extends TreeTable {
private final static int IS_ENABLED_COLUMN = 2;
public static int getAdditionalPadding() {
return SystemInfo.isMac || Registry.is("ide.scroll.new.layout") ? 10 : 0;
return SystemInfo.isMac ? 10 : 0;
}
public static InspectionsConfigTreeTable create(final InspectionsConfigTreeTableSettings settings, Disposable parentDisposable) {
@@ -106,7 +104,7 @@ public class InspectionsConfigTreeTable extends TreeTable {
severitiesColumn.setMaxWidth(20);
final TableColumn isEnabledColumn = getColumnModel().getColumn(IS_ENABLED_COLUMN);
TableUtil.setupCheckboxColumn(isEnabledColumn, getAdditionalPadding());
isEnabledColumn.setMaxWidth(20 + getAdditionalPadding());
isEnabledColumn.setCellRenderer(new ThreeStateCheckBoxRenderer());
isEnabledColumn.setCellEditor(new ThreeStateCheckBoxRenderer());
platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java
+2
View File
@@ -485,6 +485,7 @@ public class JBScrollPane extends JScrollPane {
}
Rectangle vsbBounds = new Rectangle(0, bounds.y - insets.top, 0, 0);
if (vsb != null) {
if (!SystemInfo.isMac && view instanceof JTable) vsb.setOpaque(true);
vsbOpaque = vsb.isOpaque();
if (vsbNeeded) {
adjustForVSB(bounds, insets, vsbBounds, vsbOpaque, vsbOnLeft);
@@ -504,6 +505,7 @@ public class JBScrollPane extends JScrollPane {
}
Rectangle hsbBounds = new Rectangle(bounds.x - insets.left, 0, 0, 0);
if (hsb != null) {
if (!SystemInfo.isMac && view instanceof JTable) hsb.setOpaque(true);
hsbOpaque = hsb.isOpaque();
if (hsbNeeded) {
adjustForHSB(bounds, insets, hsbBounds, hsbOpaque, hsbOnTop);
platform/platform-impl/src/com/intellij/ide/plugins/PluginTable.java
+2 -3
View File
@@ -16,7 +16,6 @@
package com.intellij.ide.plugins;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.ui.TableUtil;
import com.intellij.ui.table.JBTable;
@@ -48,8 +47,7 @@ public class PluginTable extends JBTable {
final ColumnInfo columnInfo = model.getColumnInfos()[i];
column.setCellEditor(columnInfo.getEditor(null));
if (columnInfo.getColumnClass() == Boolean.class) {
int gap = !SystemInfo.isMac && Registry.is("ide.scroll.new.layout") ? 14 : 4;
TableUtil.setupCheckboxColumn(column, gap);
TableUtil.setupCheckboxColumn(column);
}
}
@@ -83,6 +81,7 @@ public class PluginTable extends JBTable {
}
});
if (model.getColumnCount() > 1) {
setColumnWidth(1, new JCheckBox().getPreferredSize().width + 4);
if (SystemInfo.isMac && model.getColumnCount() == 3) {
setColumnWidth(2, 8);
}
platform/platform-impl/src/com/intellij/ide/plugins/PluginsTableRenderer.java
+1 -4
View File
@@ -21,7 +21,6 @@ import com.intellij.openapi.application.ApplicationNamesInfo;
import com.intellij.openapi.extensions.PluginId;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.FileStatus;
import com.intellij.psi.codeStyle.NameUtil;
@@ -34,7 +33,6 @@ import com.intellij.ui.speedSearch.SpeedSearchUtil;
import com.intellij.util.Function;
import com.intellij.util.text.DateFormatUtil;
import com.intellij.util.text.Matcher;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.UIUtil;
import javax.swing.*;
@@ -91,8 +89,7 @@ public class PluginsTableRenderer extends DefaultTableCellRenderer {
myInfoPanel.remove(myBottomPanel);
}
int right = !SystemInfo.isMac && Registry.is("ide.scroll.new.layout") ? JBUI.scale(10) : 3;
myPanel.setBorder(UIUtil.isRetina() ? new EmptyBorder(4, 3, 4, right) : new EmptyBorder(2, 3, 2, right));
myPanel.setBorder(UIUtil.isRetina() ? new EmptyBorder(4, 3, 4, 3) : new EmptyBorder(2, 3, 2, 3));
}
private void createUIComponents() {