Skip to content

L
luyten

幽默龙 / luyten
与 Fork 源项目一致

从无法访问的项目Fork

通知 4
Star 0
Fork 0
L
luyten

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 2dee06a2 编写于 作者: D deathmarine
浏览文件
操作

Fix Scrolling while Zooming, 

Ctrl inhibits scroll functions in RScrollPane
Addresses #53
上级 92903490
隐藏空白更改
内联 并排
Showing with 224 addition and 35 deletion
src/us/deathmarine/luyten/JFontChooser.java
浏览文件 @ 2dee06a2
......@@ -55,6 +55,10 @@ import javax.swing.text.Position;
* <pre>
**/
public class JFontChooser extends JComponent {
/**
*
*/
private static final long serialVersionUID = 8856126034081661L;
// class variables
/**
* Return value from <code>showDialog()</code>.
......@@ -83,20 +87,20 @@ public class JFontChooser extends JComponent {
// instance variables
protected int dialogResultValue = ERROR_OPTION;
private String[] fontStyleNames = null;
private String[] fontFamilyNames = null;
private String[] fontSizeStrings = null;
private JTextField fontFamilyTextField = null;
private JTextField fontStyleTextField = null;
private JTextField fontSizeTextField = null;
private JList fontNameList = null;
private JList fontStyleList = null;
private JList fontSizeList = null;
private JPanel fontNamePanel = null;
private JPanel fontStylePanel = null;
private JPanel fontSizePanel = null;
private JPanel samplePanel = null;
private JTextField sampleText = null;
private String[] fontStyleNames;
private String[] fontFamilyNames;
private String[] fontSizeStrings;
private JTextField fontFamilyTextField;
private JTextField fontStyleTextField;
private JTextField fontSizeTextField;
private JList<?> fontNameList;
private JList<?> fontStyleList;
private JList<?> fontSizeList;
private JPanel fontNamePanel;
private JPanel fontStylePanel;
private JPanel fontSizePanel;
private JPanel samplePanel;
private JTextField sampleText;
/**
* Constructs a <code>JFontChooser</code> object.
......@@ -172,9 +176,9 @@ public class JFontChooser extends JComponent {
return fontSizeTextField;
}
public JList getFontFamilyList() {
public JList<?> getFontFamilyList() {
if (fontNameList == null) {
fontNameList = new JList(getFontFamilies());
fontNameList = new JList<Object>(getFontFamilies());
fontNameList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
fontNameList.addListSelectionListener(new ListSelectionHandler(getFontFamilyTextField()));
fontNameList.setSelectedIndex(0);
......@@ -184,9 +188,9 @@ public class JFontChooser extends JComponent {
return fontNameList;
}
public JList getFontStyleList() {
public JList<?> getFontStyleList() {
if (fontStyleList == null) {
fontStyleList = new JList(getFontStyleNames());
fontStyleList = new JList<Object>(getFontStyleNames());
fontStyleList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
fontStyleList.addListSelectionListener(new ListSelectionHandler(getFontStyleTextField()));
fontStyleList.setSelectedIndex(0);
......@@ -196,9 +200,9 @@ public class JFontChooser extends JComponent {
return fontStyleList;
}
public JList getFontSizeList() {
public JList<?> getFontSizeList() {
if (fontSizeList == null) {
fontSizeList = new JList(this.fontSizeStrings);
fontSizeList = new JList<Object>(this.fontSizeStrings);
fontSizeList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
fontSizeList.addListSelectionListener(new ListSelectionHandler(getFontSizeTextField()));
fontSizeList.setSelectedIndex(0);
......@@ -390,7 +394,7 @@ public class JFontChooser extends JComponent {
public void valueChanged(ListSelectionEvent e) {
if (e.getValueIsAdjusting() == false) {
JList list = (JList) e.getSource();
JList<?> list = (JList<?>) e.getSource();
String selectedValue = (String) list.getSelectedValue();
String oldValue = textComponent.getText();
......@@ -423,9 +427,9 @@ public class JFontChooser extends JComponent {
}
protected class TextFieldKeyHandlerForListSelectionUpDown extends KeyAdapter {
private JList targetList;
private JList<?> targetList;
public TextFieldKeyHandlerForListSelectionUpDown(JList list) {
public TextFieldKeyHandlerForListSelectionUpDown(JList<?> list) {
this.targetList = list;
}
......@@ -454,9 +458,9 @@ public class JFontChooser extends JComponent {
}
protected class ListSearchTextFieldDocumentHandler implements DocumentListener {
JList targetList;
JList<?> targetList;
public ListSearchTextFieldDocumentHandler(JList targetList) {
public ListSearchTextFieldDocumentHandler(JList<?> targetList) {
this.targetList = targetList;
}
......@@ -511,6 +515,10 @@ public class JFontChooser extends JComponent {
}
protected class DialogOKAction extends AbstractAction {
/**
*
*/
private static final long serialVersionUID = 1618273732543947323L;
protected static final String ACTION_NAME = "OK";
private JDialog dialog;
......@@ -528,6 +536,10 @@ public class JFontChooser extends JComponent {
}
protected class DialogCancelAction extends AbstractAction {
/**
*
*/
private static final long serialVersionUID = -4941763616565382601L;
protected static final String ACTION_NAME = "Cancel";
private JDialog dialog;
......
src/us/deathmarine/luyten/OpenFile.java
浏览文件 @ 2dee06a2
package us.deathmarine.luyten;
import java.awt.Component;
import java.awt.Cursor;
import java.awt.Font;
import java.awt.Panel;
import java.awt.PopupMenu;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
......@@ -15,7 +15,6 @@ import java.awt.event.MouseMotionAdapter;
import java.awt.event.MouseWheelEvent;
import java.awt.event.MouseWheelListener;
import java.io.StringWriter;
import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Map;
......@@ -23,13 +22,14 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.JScrollBar;
import javax.swing.JScrollPane;
import javax.swing.JViewport;
import javax.swing.ScrollPaneConstants;
import javax.swing.Scrollable;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
import javax.swing.event.HyperlinkEvent;
import org.fife.ui.rsyntaxtextarea.LinkGenerator;
......@@ -154,6 +154,7 @@ public class OpenFile implements SyntaxConstants {
public void actionPerformed(ActionEvent e) {
JFontChooser fontChooser = new JFontChooser();
fontChooser.setSelectedFont(textArea.getFont());
fontChooser.setSelectedFontSize(textArea.getFont().getSize());
int result = fontChooser.showDialog(mainWindow);
if (result == JFontChooser.OK_OPTION)
textArea.setFont(fontChooser.getSelectedFont());
......@@ -211,19 +212,195 @@ public class OpenFile implements SyntaxConstants {
}
});
//Add Ctrl+Wheel Zoom for Text Size
/*
* Add Ctrl+Wheel Zoom for Text Size
* Removes all standard listeners and writes new listeners for wheelscroll movement.
*/
for(MouseWheelListener listeners :scrollPane.getMouseWheelListeners()){
scrollPane.removeMouseWheelListener(listeners);
};
scrollPane.addMouseWheelListener(new MouseWheelListener(){
@Override
public void mouseWheelMoved(MouseWheelEvent e) {
if ((e.getModifiersEx() & InputEvent.CTRL_DOWN_MASK) != 0){
Font font = textArea.getFont();
int size = font.getSize();
if(e.getWheelRotation() > 0){ //Down
textArea.setFont(new Font(font.getName(), font.getStyle(), ++size));
}else{
textArea.setFont(new Font(font.getName(), font.getStyle(), --size >= 2 ? --size : 2));
if(e.getWheelRotation() > 0){
textArea.setFont(new Font(font.getName(), font.getStyle(), --size >= 8 ? --size : 8));
}else{
textArea.setFont(new Font(font.getName(), font.getStyle(), ++size));
}
}
}else{
if (scrollPane.isWheelScrollingEnabled() &&
e.getWheelRotation() != 0) {
JScrollBar toScroll = scrollPane.getVerticalScrollBar();
int direction = e.getWheelRotation() < 0 ? -1 : 1;
int orientation = SwingConstants.VERTICAL;
if (toScroll == null || !toScroll.isVisible()) {
toScroll = scrollPane.getHorizontalScrollBar();
if (toScroll == null || !toScroll.isVisible()) {
return;
}
orientation = SwingConstants.HORIZONTAL;
}
e.consume();
if (e.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL) {
JViewport vp = scrollPane.getViewport();
if (vp == null) {
return;
}
Component comp = vp.getView();
int units = Math.abs(e.getUnitsToScroll());
boolean limitScroll = Math.abs(e.getWheelRotation()) == 1;
Object fastWheelScroll = toScroll.getClientProperty(
"JScrollBar.fastWheelScrolling");
if (Boolean.TRUE == fastWheelScroll &&
comp instanceof Scrollable) {
Scrollable scrollComp = (Scrollable) comp;
Rectangle viewRect = vp.getViewRect();
int startingX = viewRect.x;
boolean leftToRight =
comp.getComponentOrientation().isLeftToRight();
int scrollMin = toScroll.getMinimum();
int scrollMax = toScroll.getMaximum() -
toScroll.getModel().getExtent();
if (limitScroll) {
int blockIncr =
scrollComp.getScrollableBlockIncrement(viewRect,
orientation,
direction);
if (direction < 0) {
scrollMin = Math.max(scrollMin,
toScroll.getValue() - blockIncr);
}
else {
scrollMax = Math.min(scrollMax,
toScroll.getValue() + blockIncr);
}
}
for (int i = 0; i < units; i++) {
int unitIncr =
scrollComp.getScrollableUnitIncrement(viewRect,
orientation, direction);
if (orientation == SwingConstants.VERTICAL) {
if (direction < 0) {
viewRect.y -= unitIncr;
if (viewRect.y <= scrollMin) {
viewRect.y = scrollMin;
break;
}
}
else { // (direction > 0
viewRect.y += unitIncr;
if (viewRect.y >= scrollMax) {
viewRect.y = scrollMax;
break;
}
}
}
else {
if ((leftToRight && direction < 0) ||
(!leftToRight && direction > 0)) {
viewRect.x -= unitIncr;
if (leftToRight) {
if (viewRect.x < scrollMin) {
viewRect.x = scrollMin;
break;
}
}
}
else if ((leftToRight && direction > 0) ||
(!leftToRight && direction < 0)) {
viewRect.x += unitIncr;
if (leftToRight) {
if (viewRect.x > scrollMax) {
viewRect.x = scrollMax;
break;
}
}
}
else {
assert false : "Non-sensical ComponentOrientation / scroll direction";
}
}
}
if (orientation == SwingConstants.VERTICAL) {
toScroll.setValue(viewRect.y);
}
else {
if (leftToRight) {
toScroll.setValue(viewRect.x);
}
else {
int newPos = toScroll.getValue() -
(viewRect.x - startingX);
if (newPos < scrollMin) {
newPos = scrollMin;
}
else if (newPos > scrollMax) {
newPos = scrollMax;
}
toScroll.setValue(newPos);
}
}
} else {
int delta;
int limit = -1;
if (limitScroll) {
if (direction < 0) {
limit = toScroll.getValue() - toScroll.getBlockIncrement(direction);
} else {
limit = toScroll.getValue() + toScroll.getBlockIncrement(direction);
}
}
for (int i = 0; i < units; i++) {
if (direction > 0) {
delta = toScroll.getUnitIncrement(direction);
} else {
delta = -toScroll.getUnitIncrement(direction);
}
int oldValue = toScroll.getValue();
int newValue = oldValue + delta;
if (delta > 0 && newValue < oldValue) {
newValue = toScroll.getMaximum();
} else if (delta < 0 && newValue > oldValue) {
newValue = toScroll.getMinimum();
}
if (oldValue == newValue) {
break;
}
if (limitScroll && i > 0) {
assert limit != -1;
if ((direction < 0 && newValue < limit)
|| (direction > 0 && newValue > limit)) {
break;
}
}
toScroll.setValue(newValue);
}
}
} else if (e.getScrollType() == MouseWheelEvent.WHEEL_BLOCK_SCROLL) {
int oldValue = toScroll.getValue();
int blockIncrement = toScroll.getBlockIncrement(direction);
int delta = blockIncrement * ((direction > 0) ? +1 : -1);
int newValue = oldValue + delta;
if (delta > 0 && newValue < oldValue) {
newValue = toScroll.getMaximum();
}
else if (delta < 0 && newValue > oldValue) {
newValue = toScroll.getMinimum();
}
toScroll.setValue(newValue);
}
}
}
e.consume();
}
});
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或