Merge remote-tracking branch 'mm/9.0' into 9.0

designer/src/com/fr/grid/GridColumnUI.java

@@ -163,11 +163,11 @@ public class GridColumnUI extends ComponentUI {
         }
 
         double stringWidth = gridColumn.getFont().getStringBounds(columnContent, fontRenderContext).getWidth();
-        if (stringWidth > tmpIncreaseWidth) {
+//        if (stringWidth > tmpIncreaseWidth) {
-            paintMoreContent(i, g2d, tmpWidth1, size, tmpIncreaseWidth, isSelectedBounds, gridColumn, elementCase, columnContent, stringWidth, fmAscent);
+//            paintMoreContent(i, g2d, tmpWidth1, size, tmpIncreaseWidth, isSelectedBounds, gridColumn, elementCase, columnContent, stringWidth, fmAscent);
-        } else {
+//        } else {
             paintNormalContent(i, g2d, tmpWidth1, tmpIncreaseWidth, isSelectedBounds, gridColumn, elementCase, columnContent, stringWidth, fmAscent);
-        }
+//        }
     }
 
 

designer_base/src/com/fr/design/mainframe/JSliderPane.java

@@ -107,6 +107,7 @@ public class JSliderPane extends JPanel {
                     public void run() {
                         sliderValue = slider.getValue();
                         getTimes(sliderValue);
+                        showValue = times;
                         showVal.setText(times + "%");
                     }
                 });
@@ -120,6 +121,7 @@ public class JSliderPane extends JPanel {
         @Override
         public void insertUpdate(DocumentEvent e) {
             isButtonOrIsTxt = true;
+            resolutionTimes = divide(showValue,100,2);
             refreshSlider();
             refreshBody();
         }
@@ -147,9 +149,9 @@ public class JSliderPane extends JPanel {
     }
 
     private void refreshBody(){
-        this.resolutionTimes = divide(showValue,100,2);
+
-        int resolution =  (int) (ScreenResolution.getScreenResolution()*resolutionTimes);
+//        int resolution =  (int) (ScreenResolution.getScreenResolution()*resolutionTimes);
-        HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setScale(resolution);
+//        HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setScale(resolution);
 
     }
 
@@ -175,16 +177,20 @@ public class JSliderPane extends JPanel {
             if(e.getActionCommand().equals("less")){
                 int newDownVal = showValue - 10;
                 if (newDownVal >= 10 ){
+                    showValue = newDownVal;
                     showVal.setText(newDownVal + "%");
                 }else {
+                    showValue = newDownVal;
                     showVal.setText(10 + "%");
                 }
             }
             if(e.getActionCommand().equals("more")){
                 int newUpVal = showValue + 10;
                 if (newUpVal <= 400 ){
+                    showValue = newUpVal;
                     showVal.setText(newUpVal + "%");
                 }else {
+                    showValue = newUpVal;
                     showVal.setText(400 + "%");
                 }
             }

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

@@ -155,7 +155,9 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
 			@Override
 			public void insertUpdate(DocumentEvent e) {
 //				slidePane.getShowVal().getDocument()
-				double value = slidePane.getshowValue();
+				double value = Integer.parseInt(slidePane.getShowVal().getText().substring(0, slidePane.getShowVal().getText().indexOf("%")));
+				value = value>400 ? 400 : value;
+				value = value<10 ? 10 : value;
 				reCalculateRoot(value, true);
 				JTemplate form = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
 				if(form != null){