Skip to content

Add font size shortcuts (menu, keyboard and mouse) #6551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 1, 2017
Merged

Add font size shortcuts (menu, keyboard and mouse) #6551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04a7e7f
Add font size shortcuts (menu and keyboard)
gdyr Jun 18, 2017
c07f8fc
Use CTRL+"+" as Increase Font shortcut
facchinm Jul 25, 2017
388822a
Implement font increse/decrease with CTRL+MouseWheel
facchinm Jul 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions app/src/processing/app/Base.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1839,6 +1839,17 @@ public void handlePrefs() {
dialog.setVisible(true);
}

/**
* Adjust font size
*/
public void handleFontSizeChange(int change) {
String pieces[] = PApplet.split(PreferencesData.get("editor.font"), ',');
int newSize = Integer.parseInt(pieces[2]) + change;
pieces[2] = String.valueOf(newSize);
PreferencesData.set("editor.font", PApplet.join(pieces, ','));
this.getEditors().forEach(processing.app.Editor::applyPreferences);
}

// XXX: Remove this method and make librariesIndexer non-static
static public LibraryList getLibraries() {
return BaseNoGui.librariesIndexer.getInstalledLibraries();
Expand Down
18 changes: 18 additions & 0 deletions app/src/processing/app/Editor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1374,6 +1374,24 @@ public void actionPerformed(ActionEvent e) {

menu.addSeparator();

JMenuItem increaseFontSizeItem = newJMenuItem(tr("Increase Font Size"), '+');
increaseFontSizeItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
base.handleFontSizeChange(1);
}
});
menu.add(increaseFontSizeItem);

JMenuItem decreaseFontSizeItem = newJMenuItem(tr("Decrease Font Size"), '-');
decreaseFontSizeItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
base.handleFontSizeChange(-1);
}
});
menu.add(decreaseFontSizeItem);

menu.addSeparator();

JMenuItem findItem = newJMenuItem(tr("Find..."), 'F');
findItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
Expand Down
18 changes: 17 additions & 1 deletion app/src/processing/app/EditorTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
import java.awt.Font;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseWheelListener;
import java.awt.event.MouseWheelEvent;

import java.io.IOException;

import javax.swing.Action;
Expand Down Expand Up @@ -64,7 +67,7 @@
/**
* Single tab, editing a single file, in the main window.
*/
public class EditorTab extends JPanel implements SketchFile.TextStorage {
public class EditorTab extends JPanel implements SketchFile.TextStorage, MouseWheelListener {
protected Editor editor;
protected SketchTextArea textarea;
protected RTextScrollPane scrollPane;
Expand Down Expand Up @@ -106,6 +109,7 @@ public EditorTab(Editor editor, SketchFile file, String contents)
file.setStorage(this);
applyPreferences();
add(scrollPane, BorderLayout.CENTER);
textarea.addMouseWheelListener(this);
}

private RSyntaxDocument createDocument(String contents) {
Expand Down Expand Up @@ -178,6 +182,18 @@ private SketchTextArea createTextArea(RSyntaxDocument document)
return textArea;
}

public void mouseWheelMoved(MouseWheelEvent e) {
if (e.isControlDown()) {
if (e.getWheelRotation() < 0) {
editor.base.handleFontSizeChange(1);
} else {
editor.base.handleFontSizeChange(-1);
}
} else {
e.getComponent().getParent().dispatchEvent(e);
}
}

private void configurePopupMenu(final SketchTextArea textarea){

JPopupMenu menu = textarea.getPopupMenu();
Expand Down