Calculator

Merge lp:~embik/pantheon-calculator/button-layout into lp:~elementary-apps/pantheon-calculator/trunk

  1. button-layout
  2. Merge into trunk
Proposed by Marvin Beckers
Status: Merged
Approved by: Marvin Beckers
Approved revision: 85
Merged at revision: 86
Proposed branch: lp:~embik/pantheon-calculator/button-layout
Merge into: lp:~elementary-apps/pantheon-calculator/trunk
Diff against target: 18 lines (+4/-4)
1 file modified
src/MainWindow.vala (+4/-4)
To merge this branch: bzr merge lp:~embik/pantheon-calculator/button-layout
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+246841@code.launchpad.net

Commit message

changed button layout for math operations

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/MainWindow.vala'
2--- src/MainWindow.vala 2015-01-14 19:50:02 +0000
3+++ src/MainWindow.vala 2015-01-18 11:47:13 +0000
4@@ -202,10 +202,10 @@
5 sub_grid_1.attach (button_percent, 2, 1, 1, 1);
6
7 sub_grid_1.attach (button_undo, 1, 1, 1, 1);
8- sub_grid_1.attach (button_add, 3, 1, 1, 1);
9- sub_grid_1.attach (button_sub, 3, 2, 1, 1);
10- sub_grid_1.attach (button_mult, 3, 3, 1, 1);
11- sub_grid_1.attach (button_div, 3, 4, 1, 1);
12+ sub_grid_1.attach (button_div, 3, 1, 1, 1);
13+ sub_grid_1.attach (button_mult, 3, 2, 1, 1);
14+ sub_grid_1.attach (button_sub, 3, 3, 1, 1);
15+ sub_grid_1.attach (button_add, 3, 4, 1, 1);
16
17 sub_grid_1.attach (button_del, 0, 1, 1, 1);
18 sub_grid_1.attach (button_calc, 3, 5, 1, 1);

Subscribers

People subscribed via source and target branches

to all changes: