Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix sortOrder param on tablet buttons

Browse source
This commit is contained in:
luiscuenca 2018-01-19 11:22:37 -07:00
parent 2e4fc5e58c
commit 27ea74f5bf
13 changed files with 40 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
libraries/ui/src/ui/TabletScriptingInterface.cpp
View file

@ -31,6 +31,8 @@
const QString SYSTEM_TOOLBAR = "com.highfidelity.interface.toolbar.system";
const QString SYSTEM_TABLET = "com.highfidelity.interface.tablet.system";
const QString TabletScriptingInterface::QML = "hifi/tablet/TabletRoot.qml";
const QString BUTTON_SORT_ORDER_KEY = "sortOrder";
const int DEFAULT_BUTTON_SORT_ORDER = 100;
static QString getUsername() {
QString username = "Unknown user";
@ -74,11 +76,20 @@ QVariant TabletButtonListModel::data(const QModelIndex& index, int role) const {
}
TabletButtonProxy* TabletButtonListModel::addButton(const QVariant& properties) {
auto tabletButtonProxy = QSharedPointer<TabletButtonProxy>(new TabletButtonProxy(properties.toMap()));
QVariantMap newTabletButtonProperties = properties.toMap();
if (newTabletButtonProperties.find(BUTTON_SORT_ORDER_KEY) == newTabletButtonProperties.end()) {
newTabletButtonProperties[BUTTON_SORT_ORDER_KEY] = DEFAULT_BUTTON_SORT_ORDER;
}
int insertButtonUsingIndex = computeNewButtonIndex(newTabletButtonProperties);
auto newTabletButtonProxy = QSharedPointer<TabletButtonProxy>(new TabletButtonProxy(newTabletButtonProperties));
beginResetModel();
_buttons.push_back(tabletButtonProxy);
if (insertButtonUsingIndex < _buttons.size()) {
_buttons.insert(_buttons.begin() + insertButtonUsingIndex, newTabletButtonProxy);
} else {
_buttons.push_back(newTabletButtonProxy);
}
endResetModel();
return tabletButtonProxy.data();
return newTabletButtonProxy.data();
}
void TabletButtonListModel::removeButton(TabletButtonProxy* button) {
@ -92,6 +103,20 @@ void TabletButtonListModel::removeButton(TabletButtonProxy* button) {
endResetModel();
}
int TabletButtonListModel::computeNewButtonIndex(const QVariantMap& newButtonProperties) {
int buttonCount = (int)_buttons.size();
int newButtonSortOrder = newButtonProperties[BUTTON_SORT_ORDER_KEY].toInt();
if (newButtonSortOrder == DEFAULT_BUTTON_SORT_ORDER) return buttonCount;
for (int i = 0; i < buttonCount; i++) {
QVariantMap tabletButtonProperties = _buttons[i]->getProperties();
int tabletButtonSortOrder = tabletButtonProperties[BUTTON_SORT_ORDER_KEY].toInt();
if (newButtonSortOrder <= tabletButtonSortOrder) {
return i;
}
}
return buttonCount;
}
TabletButtonsProxyModel::TabletButtonsProxyModel(QObject *parent)
: QSortFilterProxyModel(parent) {
}

1
libraries/ui/src/ui/TabletScriptingInterface.h
View file

@ -115,6 +115,7 @@ protected:
friend class TabletProxy;
TabletButtonProxy* addButton(const QVariant& properties);
void removeButton(TabletButtonProxy* button);
int computeNewButtonIndex(const QVariantMap& newButtonProperties);
using List = std::list<QSharedPointer<TabletButtonProxy>>;
static QHash<int, QByteArray> _roles;
static Qt::ItemFlags _flags;

3
scripts/developer/tests/dynamics/dynamicsTests.js
View file

@ -22,8 +22,7 @@
var button = tablet.addButton({
icon: Script.resolvePath("dynamicsTests.svg"),
text: "Dynamics",
sortOrder: 15
text: "Dynamics"
});

3
scripts/developer/utilities/render/debugHighlight.js
View file

@ -32,8 +32,7 @@
var button = tablet.addButton({
text: TABLET_BUTTON_NAME,
icon: ICON_URL,
activeIcon: ACTIVE_ICON_URL,
sortOrder: 1
activeIcon: ACTIVE_ICON_URL
});
var hasEventBridge = false;

3
scripts/developer/utilities/render/lod.js
View file

@ -30,8 +30,7 @@
var button = tablet.addButton({
text: TABLET_BUTTON_NAME,
icon: ICON_URL,
activeIcon: ACTIVE_ICON_URL,
sortOrder: 1
activeIcon: ACTIVE_ICON_URL
});
var hasEventBridge = false;

3
scripts/developer/utilities/render/luci.js
View file

@ -31,8 +31,7 @@
var button = tablet.addButton({
text: TABLET_BUTTON_NAME,
icon: ICON_URL,
activeIcon: ACTIVE_ICON_URL,
sortOrder: 1
activeIcon: ACTIVE_ICON_URL
});
var hasEventBridge = false;

3
scripts/system/chat.js
View file

@ -945,8 +945,7 @@
tabletButton = tablet.addButton({
icon: tabletButtonIcon,
activeIcon: tabletButtonActiveIcon,
text: tabletButtonName,
sortOrder: 0
text: tabletButtonName
});
Messages.subscribe(channelName);

3
scripts/system/generalSettings.js
View file

@ -37,8 +37,7 @@
tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
button = tablet.addButton({
icon: "icons/tablet-icons/goto-i.svg",
text: buttonName,
sortOrder: 8
text: buttonName
});
}

3
scripts/system/goto.js
View file

@ -41,8 +41,7 @@ if (Settings.getValue("HUDUIEnabled")) {
button = tablet.addButton({
icon: "icons/tablet-icons/goto-i.svg",
activeIcon: "icons/tablet-icons/goto-a.svg",
text: buttonName,
sortOrder: 8
text: buttonName
});
}

3
scripts/system/run.js
View file

@ -10,8 +10,7 @@
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
var button = tablet.addButton({
icon: Script.resolvePath("assets/images/run.svg"),
text: "RUN",
sortOrder: 15
text: "RUN"
});
function onClicked() {

3
scripts/system/tablet-users.js
View file

@ -37,8 +37,7 @@
var button = tablet.addButton({
icon: "icons/tablet-icons/users-i.svg",
activeIcon: "icons/tablet-icons/users-a.svg",
text: "USERS",
sortOrder: 11
text: "USERS"
});
var onUsersScreen = false;

3
unpublishedScripts/marketplace/clap/clapApp.js
View file

@ -31,8 +31,7 @@ var activeButton = tablet.addButton({
icon: whiteIcon,
activeIcon: blackIcon,
text: APP_NAME,
isActive: isActive,
sortOrder: 11
isActive: isActive
});
if (isActive) {

3
unpublishedScripts/marketplace/skyboxChanger/skyboxchanger.js
View file

@ -32,8 +32,7 @@
var button = tablet.addButton({
icon: ICONS.icon,
activeIcon: ICONS.activeIcon,
text: TABLET_BUTTON_NAME,
sortOrder: 1
text: TABLET_BUTTON_NAME
});
var hasEventBridge = false;