Skip to content

Commit

Permalink
Merge branch 'dev' into release/v0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@simon-wh
simon-wh committed Nov 11, 2019
2 parents 7f4e9ab + 8f20905 commit 933592f
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 123 deletions.
4 changes: 2 additions & 2 deletions Project-Aurora/Project-Aurora/Settings/KeyboardLayoutManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,15 +230,15 @@ public void AddFeature(KeyboardKey[] keys, KeyboardRegion insertion_region = Key
KeyText.Add(key.tag, key.visualName);

if (key.width + key.margin_left > _region.Width)
_region.Width += (float)(key.width + key.margin_left - location_x);
_region.Width = (float)(key.width + key.margin_left);
else if (key.margin_left + added_width < 0)
{
added_width = -(float)(key.margin_left);
_region.Width -= (float)(key.margin_left);
}

if (key.height + key.margin_top > _region.Height)
_region.Height += (float)(key.height + key.margin_top - location_y);
_region.Height = (float)(key.height + key.margin_top);
else if (key.margin_top + added_height < 0)
{
added_height = -(float)(key.margin_top);
Expand Down
150 changes: 29 additions & 121 deletions Project-Aurora/Project-Aurora/kb_layouts/Extra Features/generic_mousepad.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,262 +4,170 @@
"grouped_keys": [
{
"tag": -1,
"margin_left": 15.0,
"margin_top": -200.0,
"margin_left": 25.0,
"margin_top": -185.0,
"width": 200.0,
"height": 168.0,
"width_bits": 6,
"height_bits": 6,
"margin_left_bits": 2,
"margin_top_bits": -6,
"enabled": true,
"absolute_location": true
},
{
"visualName": "Mouse Logo",
"tag": 160,
"margin_left": 90.0,
"margin_top": -150.0,
"margin_left": 100.0,
"margin_top": -125.0,
"width": 50.0,
"height": 50.0,
"width_bits": 2,
"height_bits": 2,
"margin_left_bits": 2,
"margin_top_bits": -6,
"enabled": true,
"absolute_location": true
},
{
"visualName": "",
"tag": 201,
"margin_left": 15.0,
"margin_top": -200.0,
"margin_top": -185.0,
"width": 10.0,
"height": 33.6,
"width_bits": 2,
"height_bits": 2,

"margin_left_bits": 2,
"margin_top_bits": -6,
"enabled": true,
"absolute_location": true
},
{
"visualName": "",
"tag": 202,
"margin_left": 15.0,
"margin_top": -168.0,
"margin_top": -151.4,
"width": 10.0,
"height": 33.6,
"width_bits": 6,

"height_bits": 6,
"margin_left_bits": 2,
"margin_top_bits": -6,
"enabled": true,
"absolute_location": true
},
{
"visualName": "",
"tag": 203,
"margin_left": 15.0,
"margin_top": -136.0,
"margin_top": -117.8,
"width": 10.0,
"height": 33.6,
"width_bits": 6,

"height_bits": 6,
"margin_left_bits": 2,
"margin_top_bits": -6,
"enabled": true,
"absolute_location": true
},
{
"visualName": "",
"tag": 204,
"margin_left": 15.0,
"margin_top": -104.0,
"margin_top": -84.2,
"width": 10.0,
"height": 33.6,
"width_bits": 6,
"height_bits": 6,

"margin_left_bits": 2,
"margin_top_bits": -6,
"enabled": true,
"absolute_location": true
},
{
"visualName": "",
"tag": 205,
"margin_left": 15.0,
"margin_top": -72.0,
"margin_top": -50.6,
"width": 10.0,
"height": 33.6,
"width_bits": 6,
"height_bits": 6,

"margin_left_bits": 2,
"margin_top_bits": -6,
"enabled": true,
"absolute_location": true
},
{
"tag": 206,
"visualName": "",
"margin_left": 15.0,
"margin_top": -45.0,
"margin_left": 25.0,
"margin_top": -17.0,
"width": 40.0,
"height": 10.0,
"width_bits": 6,

"height_bits": 6,
"margin_left_bits": 2,
"margin_top_bits": -6,
"enabled": true,
"absolute_location": true
},
{

"tag": 207,
"visualName": "",
"margin_left": 55.0,
"margin_top": -45.0,
"margin_left": 65.0,
"margin_top": -17.0,
"width": 40.0,
"height": 10.0,

"width_bits": 6,
"height_bits": 6,
"margin_left_bits": 2,
"margin_top_bits": -6,
"enabled": true,
"absolute_location": true
},
{

"tag": 208,
"visualName": "",
"margin_left": 95.0,
"margin_top": -45.0,

"margin_left": 105.0,
"margin_top": -17.0,
"width": 40.0,
"height": 10.0,
"width_bits": 6,
"height_bits": 6,
"margin_left_bits": 2,
"margin_top_bits": -6,
"enabled": true,
"absolute_location": true
},
{

"tag": 209,
"visualName": "",
"margin_left": 135.0,
"margin_top": -45.0,
"margin_left": 145.0,
"margin_top": -17.0,
"width": 40.0,
"height": 10.0,
"width_bits": 6,
"height_bits": 6,
"margin_left_bits": 2,

"margin_top_bits": -6,
"enabled": true,
"absolute_location": true
},
{

"tag": 210,
"visualName": "",
"margin_left": 175.0,
"margin_top": -45.0,
"margin_left": 185.0,
"margin_top": -17.0,
"width": 40.0,
"height": 10.0,
"width_bits": 6,

"height_bits": 6,
"margin_left_bits": 2,
"margin_top_bits": -6,
"enabled": true,
"absolute_location": true
},
{

"tag": 211,
"visualName": "",
"margin_left": 205.0,
"margin_top": -75.0,
"margin_left": 225.0,
"margin_top": -50.5,
"width": 10.0,
"height": 33.6,
"width_bits": 6,

"height_bits": 6,
"margin_left_bits": 2,
"margin_top_bits": -6,
"enabled": true,
"absolute_location": true
},
{

"tag": 212,
"visualName": "",
"margin_left": 205.0,
"margin_top": -107.0,
"margin_left": 225.0,
"margin_top": -84.2,
"width": 10.0,

"height": 33.6,
"width_bits": 6,
"height_bits": 6,
"margin_left_bits": 2,
"margin_top_bits": -6,
"enabled": true,
"absolute_location": true
},
{

"tag": 213,
"visualName": "",
"margin_left": 205.0,
"margin_top": -139.0,
"margin_left": 225.0,
"margin_top": -117.8,
"width": 10.0,
"height": 33.6,
"width_bits": 6,
"height_bits": 6,
"margin_left_bits": 2,

"margin_top_bits": -6,
"enabled": true,
"absolute_location": true
},
{

"tag": 214,
"visualName": "",
"margin_left": 205.0,
"margin_top": -171.0,
"margin_left": 225.0,
"margin_top": -151.4,
"width": 10.0,
"height": 33.6,
"width_bits": 6,

"height_bits": 6,
"margin_left_bits": 2,
"margin_top_bits": -6,
"enabled": true,
"absolute_location": true
},
{

"tag": 215,
"visualName": "",
"margin_left": 205.0,
"margin_top": -200.0,
"margin_left": 225.0,
"margin_top": -185.0,
"width": 10.0,
"height": 33.6,

"width_bits": 6,
"height_bits": 6,
"margin_left_bits": 2,
"margin_top_bits": -6,
"enabled": true,
"absolute_location": true
}
Expand Down

0 comments on commit 933592f

Please sign in to comment.