[polari] mainWindow: Disable join-menu in selection mode
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari] mainWindow: Disable join-menu in selection mode
- Date: Tue, 4 Mar 2014 21:40:31 +0000 (UTC)
commit abe9e6ce3bccff0320f2fc32cb909d3c3e7747f2
Author: Florian Müllner <fmuellner gnome org>
Date: Fri Feb 28 08:12:53 2014 +0100
mainWindow: Disable join-menu in selection mode
Connecting to new rooms while selecting rooms to leave is a bit odd;
just hide the join button during selection mode to keep the focus
on room removal.
https://bugzilla.gnome.org/show_bug.cgi?id=725688
data/resources/main-window.ui | 4 ++--
src/mainWindow.js | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/data/resources/main-window.ui b/data/resources/main-window.ui
index 44c66dc..631a77c 100644
--- a/data/resources/main-window.ui
+++ b/data/resources/main-window.ui
@@ -34,7 +34,7 @@
<class name="titlebar"/>
</style>
<child>
- <object class="GtkMenuButton" id="button1">
+ <object class="GtkMenuButton" id="join_menu_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
@@ -230,7 +230,7 @@
<object class="PolariFixedSizeFrame" id="frame1">
<property name="visible">True</property>
<property name="hexpand">False</property>
- <property name="width">200</property>
+ <property name="width">300</property>
<style>
<class name="sidebar"/>
<class name="polari-sidebar"/>
diff --git a/src/mainWindow.js b/src/mainWindow.js
index e8f1576..839d32f 100644
--- a/src/mainWindow.js
+++ b/src/mainWindow.js
@@ -69,6 +69,7 @@ const MainWindow = new Lang.Class({
this._subtitleLabel = builder.get_object('subtitle_label');
this._selectionRevealer = builder.get_object('selection_toolbar_revealer');
+ this._joinMenuButton = builder.get_object('join_menu_button');
this._showUserListButton = builder.get_object('show_user_list_button');
this._revealer = builder.get_object('room_list_revealer');
this._chatStack = builder.get_object('chat_stack');
@@ -193,6 +194,7 @@ const MainWindow = new Lang.Class({
_onSelectionModeChanged: function() {
let enabled = this._selectionModeAction.state.get_boolean();
this._selectionRevealer.reveal_child = enabled;
+ this._joinMenuButton.visible = !enabled;
this._showUserListButton.visible = !enabled;
this._userListAction.enabled = !enabled;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]