Browse Source

REPORT-62398 && REPORT-62397【接触点优化】查看推荐组件按钮,显示不全;【接触点优化】筛选面板存在时,上下滑动鼠标显示异常

feature/x
kerry 3 years ago
parent
commit
0dbfac7719
  1. 7
      designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/OnlineWidgetBlock.java
  2. 4
      designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/AbstractOnlineWidgetSelectPane.java
  3. 6
      designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetRepoPane.java
  4. 7
      designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetTabPane.java
  5. 2
      designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/embed/EmbedPane.java
  6. 6
      designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/embed/OnlineEmbedFilterShowPane.java

7
designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/OnlineWidgetBlock.java

@ -357,6 +357,9 @@ public class OnlineWidgetBlock extends AbstractOnlineWidgetBlock {
if (isUnusable) {
paintUnusableMask((Graphics2D) g);
}
if (this.parentPane != null) {
this.parentPane.refreshShowPaneUI();
}
}
protected void paintUnusableMask(Graphics2D g2d) {
@ -393,14 +396,12 @@ public class OnlineWidgetBlock extends AbstractOnlineWidgetBlock {
g2d.setColor(oldColor);
g2d.setFont(oldFont);
}
@Override
public void repaint() {
super.repaint();
if (this.parentPane != null) {
this.parentPane.refreshUI();
}
}
class WidgetDownloadProcess implements com.fr.design.extra.Process<Double> {

4
designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/AbstractOnlineWidgetSelectPane.java

@ -242,7 +242,7 @@ public abstract class AbstractOnlineWidgetSelectPane extends AbstractWidgetSele
return this.getParent();
}
public void refreshUI() {
OnlineWidgetRepoPane.getInstance().repaint();
public void refreshShowPaneUI() {
OnlineWidgetRepoPane.getInstance().refreshShowPaneUI();
}
}

6
designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetRepoPane.java

@ -228,6 +228,12 @@ public class OnlineWidgetRepoPane extends BasicPane {
}
}
public void refreshShowPaneUI(){
if (componentTabPane != null) {
this.componentTabPane.refreshShowPaneUI();
}
}
public void completeEmbedFilter(){
if (componentTabPane != null) {

7
designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetTabPane.java

@ -87,6 +87,13 @@ public class OnlineWidgetTabPane extends JPanel {
this.cardLayout.show(centerPane, ComponentShareUtil.needShowEmbedFilterPane() ? COMPONENT_EMBED : COMPONENT);
}
public void refreshShowPaneUI(){
if (embedFilterShowPane != null) {
this.embedFilterShowPane.refreshUI();
}
}
public void removeTabChangeListener(TabChangeListener listener) {
tabChangeListeners.remove(listener);
}

2
designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/embed/EmbedPane.java

@ -86,7 +86,7 @@ public class EmbedPane extends JPanel {
protected void paintBorder(Graphics g, UIButton b) {
Color oldColor = g.getColor();
g.setColor(SEARCH_BUTTON_COLOR);
g.drawRoundRect(0, 0, b.getWidth(), b.getHeight(), 2, 2);
g.drawRoundRect(0, 0, b.getWidth() - 4, b.getHeight() - 4, 2, 2);
g.setColor(oldColor);
}
});

6
designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/embed/OnlineEmbedFilterShowPane.java

@ -36,6 +36,12 @@ public class OnlineEmbedFilterShowPane extends JPanel {
selectPane.animate();
}
public void refreshUI(){
if (embedPane != null) {
this.repaint();
}
}
public void completeEmbedFilter(){
if (embedPane!= null && embedPane.isShowing()){
this.remove(embedPane);

Loading…
Cancel
Save