Skip to content

Commit 6d49f15

Browse files
committed
Fixed #124. Position X and Y broken after linting changes
1 parent dae1ac0 commit 6d49f15

4 files changed

Lines changed: 13 additions & 9 deletions

File tree

src/configModel/configModel.vala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,13 @@ namespace SwayNotificationCenter {
271271
/* Properties */
272272

273273
/** The notifications and controlcenters horizontal alignment */
274-
public PositionX position_x { get; set; default = PositionX.RIGHT; }
274+
public PositionX positionX { // vala-lint=naming-convention
275+
get; set; default = PositionX.RIGHT;
276+
}
275277
/** The notifications and controlcenters vertical alignment */
276-
public PositionY position_y { get; set; default = PositionY.TOP; }
278+
public PositionY positionY { // vala-lint=naming-convention
279+
get; set; default = PositionY.TOP;
280+
}
277281

278282
/** The timeout for notifications with NORMAL priority */
279283
private const int TIMEOUT_DEFAULT = 10;

src/controlCenter/controlCenter.vala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,24 +162,24 @@ namespace SwayNotificationCenter {
162162
ConfigModel.instance.control_center_margin_left);
163163

164164
// Anchor to north/south edges as needed
165-
bool anchor_top = ConfigModel.instance.position_y == PositionY.TOP;
165+
bool anchor_top = ConfigModel.instance.positionY == PositionY.TOP;
166166
GtkLayerShell.set_anchor (this,
167167
GtkLayerShell.Edge.TOP,
168168
ConfigModel.instance.fit_to_screen || anchor_top);
169169
GtkLayerShell.set_anchor (this,
170170
GtkLayerShell.Edge.BOTTOM,
171171
ConfigModel.instance.fit_to_screen || !anchor_top);
172172

173-
bool anchor_left = ConfigModel.instance.position_x == PositionX.LEFT;
174-
bool anchor_right = ConfigModel.instance.position_x == PositionX.RIGHT;
173+
bool anchor_left = ConfigModel.instance.positionX == PositionX.LEFT;
174+
bool anchor_right = ConfigModel.instance.positionX == PositionX.RIGHT;
175175
GtkLayerShell.set_anchor (this,
176176
GtkLayerShell.Edge.RIGHT,
177177
anchor_right);
178178
GtkLayerShell.set_anchor (this,
179179
GtkLayerShell.Edge.LEFT,
180180
anchor_left);
181181

182-
switch (ConfigModel.instance.position_y) {
182+
switch (ConfigModel.instance.positionY) {
183183
case PositionY.BOTTOM:
184184
list_reverse = true;
185185
list_align = Gtk.Align.END;

src/notiWindow/notiWindow.vala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ namespace SwayNotificationCenter {
7575
}
7676

7777
private void set_anchor () {
78-
switch (ConfigModel.instance.position_x) {
78+
switch (ConfigModel.instance.positionX) {
7979
case PositionX.LEFT:
8080
GtkLayerShell.set_anchor (
8181
this, GtkLayerShell.Edge.RIGHT, false);
@@ -95,7 +95,7 @@ namespace SwayNotificationCenter {
9595
this, GtkLayerShell.Edge.RIGHT, true);
9696
break;
9797
}
98-
switch (ConfigModel.instance.position_y) {
98+
switch (ConfigModel.instance.positionY) {
9999
case PositionY.BOTTOM:
100100
GtkLayerShell.set_anchor (
101101
this, GtkLayerShell.Edge.TOP, false);

src/notification/notification.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ namespace SwayNotificationCenter {
159159

160160
this.carousel.set_animation_duration (this.transition_time);
161161
// Changes the swipte direction depending on the notifications X position
162-
switch (ConfigModel.instance.position_x) {
162+
switch (ConfigModel.instance.positionX) {
163163
case PositionX.LEFT:
164164
this.carousel.reorder (event_box, 0);
165165
this.carousel_empty_widget_index = 1;

0 commit comments

Comments
 (0)