Some fixes
* Scrollbar on hotkeys window * Guild channel will appears on channel list but not yet working properly
This commit is contained in:
parent
dcefeb134c
commit
c903cc7ec4
|
@ -148,7 +148,7 @@ local function onChannelList(channelList)
|
||||||
local channelId = v[1]
|
local channelId = v[1]
|
||||||
local channelName = v[2]
|
local channelName = v[2]
|
||||||
|
|
||||||
if channelId ~= 0 and #channelName > 0 then
|
if #channelName > 0 then
|
||||||
local label = createWidget('ChannelListLabel', channelListPanel)
|
local label = createWidget('ChannelListLabel', channelListPanel)
|
||||||
label.channelId = channelId
|
label.channelId = channelId
|
||||||
label:setText(channelName)
|
label:setText(channelName)
|
||||||
|
|
|
@ -286,7 +286,7 @@ end
|
||||||
function HotkeysManager.call(keyCombo)
|
function HotkeysManager.call(keyCombo)
|
||||||
if g_game.isOnline() then
|
if g_game.isOnline() then
|
||||||
local hotKey = hotkeyList[keyCombo]
|
local hotKey = hotkeyList[keyCombo]
|
||||||
if hotKey.itemId == nil and hotKey.value ~= '' then
|
if hotKey ~= nil and hotKey.itemId == nil and hotKey.value ~= '' then
|
||||||
if hotKey.autoSend then
|
if hotKey.autoSend then
|
||||||
g_game.talk(hotKey.value)
|
g_game.talk(hotKey.value)
|
||||||
else
|
else
|
||||||
|
|
|
@ -23,12 +23,21 @@ MainWindow
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
|
|
||||||
|
VerticalScrollBar
|
||||||
|
id: currentHotkeysScrollBar
|
||||||
|
height: 150
|
||||||
|
anchors.top: parent.top
|
||||||
|
anchors.right: parent.right
|
||||||
|
step: 14
|
||||||
|
pixels-scroll: true
|
||||||
|
|
||||||
TextList
|
TextList
|
||||||
id: currentHotkeys
|
id: currentHotkeys
|
||||||
|
vertical-scrollbar: currentHotkeysScrollBar
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: prev.left
|
||||||
anchors.top: prev.bottom
|
anchors.top: prev.top
|
||||||
height: 150
|
anchors.bottom: prev.bottom
|
||||||
margin-top: 2
|
margin-top: 2
|
||||||
padding: 1
|
padding: 1
|
||||||
focusable: false
|
focusable: false
|
||||||
|
|
Loading…
Reference in New Issue