Skip to content

Commit 11171e0

Browse files
committed
standardize buttons
1 parent a9392a5 commit 11171e0

File tree

5 files changed

+30
-29
lines changed

5 files changed

+30
-29
lines changed

services/static-webserver/client/source/class/osparc/desktop/credits/CreditsIndicatorButton.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ qx.Class.define("osparc.desktop.credits.CreditsIndicatorButton", {
2323

2424
osparc.utils.Utils.setIdToWidget(this, "creditsIndicatorButton");
2525

26-
this.set({
27-
cursor: "pointer",
28-
padding: [3, 8]
29-
});
30-
3126
this.getChildControl("image").set({
3227
width: 24,
3328
height: 24

services/static-webserver/client/source/class/osparc/jobs/JobsButton.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ qx.Class.define("osparc.jobs.JobsButton", {
2626
osparc.utils.Utils.setIdToWidget(this, "jobsButton");
2727

2828
this.set({
29-
width: 30,
30-
alignX: "center",
31-
cursor: "pointer",
3229
toolTipText: this.tr("Activity Center"),
3330
});
3431

@@ -53,12 +50,12 @@ qx.Class.define("osparc.jobs.JobsButton", {
5350
switch (id) {
5451
case "icon": {
5552
control = new qx.ui.basic.Image("@FontAwesome5Solid/tasks/22");
56-
5753
const logoContainer = new qx.ui.container.Composite(new qx.ui.layout.HBox().set({
5854
alignY: "middle"
59-
}));
55+
})).set({
56+
paddingLeft: 5,
57+
});
6058
logoContainer.add(control);
61-
6259
this._add(logoContainer, {
6360
height: "100%"
6461
});

services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,15 @@ qx.Class.define("osparc.navigation.NavigationBar", {
8989
minWidth: 30,
9090
minHeight: 30
9191
},
92+
93+
RIGHT_BUTTON_OPTS: {
94+
cursor: "pointer",
95+
alignX: "center",
96+
alignY: "middle",
97+
allowGrowX: false,
98+
allowGrowY: false,
99+
padding: 4,
100+
},
92101
},
93102

94103
members: {
@@ -161,7 +170,7 @@ qx.Class.define("osparc.navigation.NavigationBar", {
161170
});
162171
break;
163172
case "right-items":
164-
control = new qx.ui.container.Composite(new qx.ui.layout.HBox(10).set({
173+
control = new qx.ui.container.Composite(new qx.ui.layout.HBox(6).set({
165174
alignY: "middle",
166175
alignX: "right"
167176
}));
@@ -244,22 +253,29 @@ qx.Class.define("osparc.navigation.NavigationBar", {
244253
}
245254
case "avatar-group": {
246255
const maxWidth = osparc.WindowSizeTracker.getInstance().isCompactVersion() ? 80 : 150;
247-
control = new osparc.ui.basic.AvatarGroup(28, "right", maxWidth).set({
256+
control = new osparc.ui.basic.AvatarGroup(26, "right", maxWidth).set({
248257
alignY: "middle",
249258
});;
250259
this.getChildControl("right-items").add(control);
251260
break;
252261
}
253262
case "tasks-button":
254-
control = new osparc.task.TasksButton();
263+
control = new osparc.task.TasksButton().set({
264+
visibility: "excluded",
265+
...this.self().RIGHT_BUTTON_OPTS
266+
});
255267
this.getChildControl("right-items").add(control);
256268
break;
257269
case "jobs-button":
258-
control = new osparc.jobs.JobsButton();
270+
control = new osparc.jobs.JobsButton().set({
271+
...this.self().RIGHT_BUTTON_OPTS
272+
});
259273
this.getChildControl("right-items").add(control);
260274
break;
261275
case "notifications-button":
262-
control = new osparc.notification.NotificationsButton();
276+
control = new osparc.notification.NotificationsButton().set({
277+
...this.self().RIGHT_BUTTON_OPTS
278+
});
263279
this.getChildControl("right-items").add(control);
264280
break;
265281
case "expiration-icon": {
@@ -289,13 +305,16 @@ qx.Class.define("osparc.navigation.NavigationBar", {
289305
break;
290306
}
291307
case "help":
292-
control = this.__createHelpMenuBtn();
293-
control.set(this.self().BUTTON_OPTIONS);
308+
control = this.__createHelpMenuBtn().set({
309+
...this.self().RIGHT_BUTTON_OPTS
310+
});
294311
osparc.utils.Utils.setIdToWidget(control, "helpNavigationBtn");
295312
this.getChildControl("right-items").add(control);
296313
break;
297314
case "credits-button":
298-
control = new osparc.desktop.credits.CreditsIndicatorButton();
315+
control = new osparc.desktop.credits.CreditsIndicatorButton().set({
316+
...this.self().RIGHT_BUTTON_OPTS
317+
});
299318
this.getChildControl("right-items").add(control);
300319
break;
301320
case "log-in-button": {

services/static-webserver/client/source/class/osparc/notification/NotificationsButton.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@ qx.Class.define("osparc.notification.NotificationsButton", {
2525

2626
osparc.utils.Utils.setIdToWidget(this, "notificationsButton");
2727

28-
this.set({
29-
width: 30,
30-
alignX: "center",
31-
cursor: "pointer"
32-
});
33-
3428
this._createChildControlImpl("icon");
3529
this._createChildControlImpl("number");
3630

services/static-webserver/client/source/class/osparc/task/TasksButton.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ qx.Class.define("osparc.task.TasksButton", {
2424
this._setLayout(new qx.ui.layout.Canvas());
2525

2626
this.set({
27-
width: 30,
28-
alignX: "center",
29-
cursor: "pointer",
30-
visibility: "excluded",
3127
toolTipText: this.tr("Tasks"),
3228
});
3329

0 commit comments

Comments
 (0)