Browse Source

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

master
plough 7 years ago
parent
commit
cc2dc6744c
  1. 8
      designer/src/com/fr/grid/GridColumnUI.java
  2. 12
      designer_base/src/com/fr/design/mainframe/JSliderPane.java
  3. 4
      designer_form/src/com/fr/design/mainframe/FormArea.java

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

@ -163,11 +163,11 @@ public class GridColumnUI extends ComponentUI {
} }
double stringWidth = gridColumn.getFont().getStringBounds(columnContent, fontRenderContext).getWidth(); 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); paintNormalContent(i, g2d, tmpWidth1, tmpIncreaseWidth, isSelectedBounds, gridColumn, elementCase, columnContent, stringWidth, fmAscent);
} // }
} }

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

@ -107,6 +107,7 @@ public class JSliderPane extends JPanel {
public void run() { public void run() {
sliderValue = slider.getValue(); sliderValue = slider.getValue();
getTimes(sliderValue); getTimes(sliderValue);
showValue = times;
showVal.setText(times + "%"); showVal.setText(times + "%");
} }
}); });
@ -120,6 +121,7 @@ public class JSliderPane extends JPanel {
@Override @Override
public void insertUpdate(DocumentEvent e) { public void insertUpdate(DocumentEvent e) {
isButtonOrIsTxt = true; isButtonOrIsTxt = true;
resolutionTimes = divide(showValue,100,2);
refreshSlider(); refreshSlider();
refreshBody(); refreshBody();
} }
@ -147,9 +149,9 @@ public class JSliderPane extends JPanel {
} }
private void refreshBody(){ 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")){ if(e.getActionCommand().equals("less")){
int newDownVal = showValue - 10; int newDownVal = showValue - 10;
if (newDownVal >= 10 ){ if (newDownVal >= 10 ){
showValue = newDownVal;
showVal.setText(newDownVal + "%"); showVal.setText(newDownVal + "%");
}else { }else {
showValue = newDownVal;
showVal.setText(10 + "%"); showVal.setText(10 + "%");
} }
} }
if(e.getActionCommand().equals("more")){ if(e.getActionCommand().equals("more")){
int newUpVal = showValue + 10; int newUpVal = showValue + 10;
if (newUpVal <= 400 ){ if (newUpVal <= 400 ){
showValue = newUpVal;
showVal.setText(newUpVal + "%"); showVal.setText(newUpVal + "%");
}else { }else {
showValue = newUpVal;
showVal.setText(400 + "%"); showVal.setText(400 + "%");
} }
} }

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

@ -155,7 +155,9 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
@Override @Override
public void insertUpdate(DocumentEvent e) { public void insertUpdate(DocumentEvent e) {
// slidePane.getShowVal().getDocument() // 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); reCalculateRoot(value, true);
JTemplate form = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); JTemplate form = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
if(form != null){ if(form != null){

Loading…
Cancel
Save