Merge lp://qastaging/~artem-anufrij/scratch/Bugfix-1193676 into lp://qastaging/~elementary-apps/scratch/scratch

Proposed by Artem Anufrij
Status: Merged
Approved by: Robert Roth
Approved revision: 1416
Merged at revision: 1400
Proposed branch: lp://qastaging/~artem-anufrij/scratch/Bugfix-1193676
Merge into: lp://qastaging/~elementary-apps/scratch/scratch
Diff against target: 330 lines (+142/-25)
4 files modified
src/MainWindow.vala (+78/-2)
src/Scratch.vala (+2/-0)
src/Widgets/SourceView.vala (+57/-22)
src/Widgets/ToolBar.vala (+5/-1)
To merge this branch: bzr merge lp://qastaging/~artem-anufrij/scratch/Bugfix-1193676
Reviewer Review Type Date Requested Status
Artem Anufrij (community) Approve
Robert Roth (community) code style Approve
Danielle Foré ux Approve
Corentin Noël code Approve
elementary Apps team code Pending
Review via email: mp+239765@code.qastaging.launchpad.net

Commit message

Zooming (ctrl + scroll, or ctrl +/-) implemented.

Description of the change

Zooming (ctrl + scroll, or ctrl +/-)

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote :

There's no easy way to get back to the default zoom level. I would suggest a tool item with the icon "zoom-original" be added to the right side of the header bar whenever the zoom level is not the default.

If I open preferences, turn off "custom font" and then try to zoom, Scratch will freeze.

review: Needs Fixing
Revision history for this message
Corentin Noël (tintou) wrote :

Working fine here

review: Approve (code)
Revision history for this message
Shawn McTear (syst3mfailur3) wrote :

For reseting to default zoom, why not add ctrl+0, as thats already the keyboard shortcut in browsers.

Note: Haven't tested code.

1409. By artem-anufrij

add zoom-original button

Revision history for this message
Danielle Foré (danrabbit) wrote :

Crash fixed and zoom button present.

If I have a custom font set, hitting the zoom button also resets the font family. It should only reset the font size.

I'm not sure "Default font" is a great tooltip. How about just "Zoom 1:1"

1410. By artem-anufrij

ctrl+0 added

1411. By artem-anufrij

Tooltip changed

Revision history for this message
Artem Anufrij (artem-anufrij) wrote :

Tooltip: "Zoom 1:1"

added Ctrl+0 for reset zoom

1412. By artem-anufrij

font familiy will not be reset on zoom 1:1

Revision history for this message
Artem Anufrij (artem-anufrij) wrote :

font familiy will not be reset on zoom 1:1

1413. By artem-anufrij

compare only font size for visiblity of zoom 1:1 button

Revision history for this message
Danielle Foré (danrabbit) wrote :

Works as expected :) Needs another code review since changes were made

review: Approve (ux)
1414. By artem-anufrij

break;

1415. By artem-anufrij

solved conflict

Revision history for this message
Robert Roth (evfool) wrote :

Clean code, two minor issues noted inline.

review: Approve (code style)
1416. By artem-anufrij

space between conversion and method name added

Revision history for this message
Artem Anufrij (artem-anufrij) wrote :

@Robert:

done...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches