Browse Source

代码质量

master
MoMeak 7 years ago
parent
commit
e567760a28
  1. 9
      designer/src/com/fr/design/mainframe/ReportComponentComposite.java
  2. 14
      designer_form/src/com/fr/design/mainframe/FormArea.java

9
designer/src/com/fr/design/mainframe/ReportComponentComposite.java

@ -145,12 +145,13 @@ public class ReportComponentComposite extends JComponent {
} }
private void updateJSlider(){ private void updateJSlider(){
if (centerCardPane.editingComponet.elementCasePane == null) { int value = 0;
jSliderContainer.getShowVal().setValue(centerCardPane.getPolyDezi().getResolution() * HUND / ScreenResolution.getScreenResolution()); if (centerCardPane.editingComponet.elementCasePane != null) {
value = centerCardPane.editingComponet.elementCasePane.getResolution() * HUND / ScreenResolution.getScreenResolution();
}else { }else {
jSliderContainer.getShowVal().setValue(centerCardPane.editingComponet.elementCasePane.getResolution() * HUND / ScreenResolution.getScreenResolution()); value = centerCardPane.getPolyDezi().getResolution() * HUND / ScreenResolution.getScreenResolution();
} }
jSliderContainer.getShowVal().setValue(value);
} }
/** /**

14
designer_form/src/com/fr/design/mainframe/FormArea.java

@ -162,15 +162,11 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
jf.resolution = (int) value; jf.resolution = (int) value;
jf.getFormDesign().setResolution((int) value); jf.getFormDesign().setResolution((int) value);
jf.getFormDesign().getArea().resolution = (int) value; jf.getFormDesign().getArea().resolution = (int) value;
double times = (double) resolution / 100; reCalculateRoot(value, true);
// widthPane.setValue((int)(widthPane.getValue() * times)); JTemplate form = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
changeWidthPaneValue((int)(widthPane.getValue() * times)); if (form != null) {
changeHeightPaneValue((int)(heightPane.getValue() * times)); form.fireTargetModified();
// reCalculateRoot(value, true); }
// JTemplate form = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
// if (form != null) {
// form.fireTargetModified();
// }
} }
}; };

Loading…
Cancel
Save