Browse Source
* commit 'b75982cb23930c32ace993da73a4eb8551a1b746': (26 commits) REPORT-60900 修正图片不符合视觉的问题 REPORT-60506 & REPORT-60504 url传参行数为负数分页生效，预定义控件没有默认名称 REPORT-61108 【视觉验收】--主题获取 REPORT-61116 【主题切换】多选单元格，格子从跟随主题切换到自定义，内边框不可设置 代码修改 REPORT-60674 FR11老自适应-报表块右侧选择自定义时，没有手动修改pc浏览器自适应的设置，应该是随着工具栏PC端报表块自适应属性的设置吧，但是出现了不一致现象；10.0是正常的 无jira任务 漏了编辑事件 REPORT-60991 导出-导出事件-其它模板-参数设置自定义时无按钮 REPORT-60942 视觉优化--高亮区域加个5像素的边框 REPORT-60942 视觉优化 REPORT-60724 服务器数据集的提示信息视觉问题 && REPORT-60892 全局自适应-样式细节优化-国际化显示不全 REPORT-61048 远程服务器文件没有权限处理 REPORT-60942 气泡弹窗交互更新 REPORT-60889 主题切换，视觉修改 REPORT-60901【固定布局-原布局推荐4.1】决策报表-自适应布局-jaimme那边出现了，拖拽组件到空白块中蓝色阴影显示偏移了 REPORT-60894【固定布局-原布局推荐4.1】决策报表-自适应布局-body的组件间隔调的比较大时，固定布局下，尺寸较小的占位块之间尝试对调组件，拖拽A到B的范围内释放鼠标，组件A会消失 REPORT-61055 【主题获取】主题导出插件几个小问题 REPORT-60895【固定布局-原布局推荐4.1】决策报表-自适应布局-非固定布局模板刚创建时，选中组件，组件不显示那个可拖拽调整尺寸的小白方框，如果尝试改变整个布局的话，选中组件时会出现白方框；这个的触发规则是什么呢 REPORT-61095 数据连接与服务器数据集两次重命名后设计器与服务器不一致 REPORT-61034 mac 全屏时引导窗口未覆盖 ...feature/x
superman
3 years ago
61 changed files with 704 additions and 258 deletions
@ -0,0 +1,47 @@
|
||||
package com.fr.design.gui.frpane; |
||||
|
||||
import java.awt.Component; |
||||
import java.awt.Container; |
||||
|
||||
/** |
||||
* @author Starryi |
||||
* @version 1.0 |
||||
* Created by Starryi on 2021/9/17 |
||||
*/ |
||||
public class AttributeChangeUtils { |
||||
private static AbstractAttrNoScrollPane findNearestAttrNoScrollPaneAncestor(Component c) { |
||||
for(Container p = c.getParent(); p != null; p = p.getParent()) { |
||||
if (p instanceof AbstractAttrNoScrollPane) { |
||||
return (AbstractAttrNoScrollPane) p; |
||||
} |
||||
} |
||||
return null; |
||||
} |
||||
|
||||
public static void changeComposedUI(Component composedComponent, boolean fireMiddleStateChanged, UIChangeAction action) { |
||||
AbstractAttrNoScrollPane attrPane = findNearestAttrNoScrollPaneAncestor(composedComponent); |
||||
boolean oldAutoFire = true; |
||||
|
||||
if (!fireMiddleStateChanged) { |
||||
// 禁止属性面板自动处理属性更新
|
||||
if (attrPane != null) { |
||||
oldAutoFire = attrPane.isAutoFireAttributesChanged(); |
||||
attrPane.setAutoFireAttributesChanged(false); |
||||
} |
||||
} |
||||
|
||||
// 更新UI
|
||||
action.changeComposedUI(); |
||||
|
||||
if (!fireMiddleStateChanged) { |
||||
// 恢复属性面板自动处理属性更新
|
||||
if (attrPane != null) { |
||||
attrPane.setAutoFireAttributesChanged(oldAutoFire); |
||||
} |
||||
} |
||||
} |
||||
|
||||
public interface UIChangeAction { |
||||
void changeComposedUI(); |
||||
} |
||||
} |
||||
@ -0,0 +1,44 @@
|
||||
package com.fr.design.mainframe.share.ui.actions; |
||||
|
||||
import com.fr.design.constants.UIConstants; |
||||
import com.fr.design.gui.imenu.UIMenuItemUI; |
||||
import com.fr.design.utils.gui.GUIPaintUtils; |
||||
import com.fr.stable.Constants; |
||||
|
||||
import javax.swing.ButtonModel; |
||||
import javax.swing.JMenu; |
||||
import javax.swing.JMenuItem; |
||||
import javax.swing.JPopupMenu; |
||||
import java.awt.Color; |
||||
import java.awt.Graphics; |
||||
import java.awt.Graphics2D; |
||||
|
||||
/** |
||||
* @author Starryi |
||||
* @version 1.0 |
||||
* Created by Starryi on 2021/10/18 |
||||
*/ |
||||
public class SharedComponentActionMenuItemUI extends UIMenuItemUI { |
||||
|
||||
@Override |
||||
protected void paintBackground(Graphics g, JMenuItem menuItem, Color bgColor) { |
||||
ButtonModel model = menuItem.getModel(); |
||||
Color oldColor = g.getColor(); |
||||
int menuWidth = menuItem.getWidth(); |
||||
int menuHeight = menuItem.getHeight(); |
||||
|
||||
g.setColor(UIConstants.NORMAL_BACKGROUND); |
||||
g.fillRect(0, 0, menuWidth, menuHeight); |
||||
if (menuItem.isOpaque()) { |
||||
if (model.isArmed() || (menuItem instanceof JMenu && model.isSelected())) { |
||||
GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 7); |
||||
} else { |
||||
GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, menuItem.getBackground(), 7); |
||||
} |
||||
g.setColor(oldColor); |
||||
} else if (model.isArmed() || (menuItem instanceof JMenu && model.isSelected())) { |
||||
GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 7); |
||||
g.setColor(oldColor); |
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,12 @@
|
||||
package com.fr.design.mainframe.share.ui.constants; |
||||
|
||||
import java.awt.Color; |
||||
|
||||
/** |
||||
* @author Starryi |
||||
* @version 1.0 |
||||
* Created by Starryi on 2021/10/19 |
||||
*/ |
||||
public class ColorConstants { |
||||
public static final Color BACKGROUND = new Color(0xF0F0F1); |
||||
} |
||||
|
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 10 KiB |
Loading…
Reference in new issue