X Tutup
Skip to content

doubleclick pause for options #5279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sturnclaw merged 9 commits into from
Oct 1, 2021
Merged

doubleclick pause for options #5279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e45fa48
doubleclick pause for options
joonicks Sep 24, 2021
bfcddd9
just the pause button!
joonicks Sep 24, 2021
d06b656
isMouseDoubleClicked
joonicks Sep 24, 2021
7417124
isItemHovered
joonicks Sep 24, 2021
0513379
if name==paused
joonicks Sep 25, 2021
3b258d6
remove obsolete lines
joonicks Sep 28, 2021
d876df9
unknown issue
joonicks Sep 28, 2021
b1480ff
back to manual doubleclick
joonicks Sep 28, 2021
335fb3f
exposing pigui ismousedoubleclicked
joonicks Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions data/pigui/libs/forwarded.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ ui.getTextLineHeightWithSpacing = pigui.GetTextLineHeightWithSpacing
ui.lowThrustButton = pigui.LowThrustButton
ui.thrustIndicator = pigui.ThrustIndicator
ui.isMouseClicked = pigui.IsMouseClicked
ui.isMouseDoubleClicked = pigui.IsMouseDoubleClicked
ui.isMouseDown = pigui.IsMouseDown
ui.getMousePos = pigui.GetMousePos
ui.getMouseWheel = pigui.GetMouseWheel
Expand Down
12 changes: 5 additions & 7 deletions data/pigui/modules/time-window.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@ local frame_padding = 3
local bg_color = colors.buttonBlue
local fg_color = colors.white


local function displayTimeWindow()
player = Game.player

-- HACK: Don't display the time window if we're in a bespoke view
if Game.CurrentView() == nil then return end

Expand All @@ -42,16 +39,17 @@ local function displayTimeWindow()
if requested == name and current ~= name then
color = colors.white
end
local time = name
-- translate only paused, the rest can stay
if time == "paused" then
time = lc.PAUSED
end
local time = (name == "paused") and lc.PAUSED or name
local tooltip = string.interp(lui.HUD_REQUEST_TIME_ACCEL, { time = time })
if ui.coloredSelectedIconButton(icons['time_accel_' .. name], button_size, current == name, frame_padding, color, fg_color, tooltip .. "##time_accel_"..name)
or (ui.shiftHeld() and ui.isKeyReleased(key)) then
Game.SetTimeAcceleration(name, ui.ctrlHeld() or ui.isMouseDown(1))
end
-- isItemHovered is true for ALL the buttons
if ui.isItemHovered(0) and ui.isMouseDoubleClicked(0) and (name == "paused") then
ui.optionsWindow:open()
end
ui.sameLine()
end

Expand Down
9 changes: 9 additions & 0 deletions src/lua/LuaPiGui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1517,6 +1517,14 @@ static int l_pigui_is_mouse_clicked(lua_State *l)
return 1;
}

static int l_pigui_is_mouse_doubleclicked(lua_State *l)
{
PROFILE_SCOPED()
int button = LuaPull<int>(l, 1);
LuaPush(l, ImGui::IsMouseDoubleClicked(button));
return 1;
}

static int l_pigui_push_font(lua_State *l)
{
PROFILE_SCOPED()
Expand Down Expand Up @@ -2875,6 +2883,7 @@ void LuaObject<PiGui::Instance>::RegisterClass()
{ "PopID", l_pigui_pop_id },
{ "IsMouseReleased", l_pigui_is_mouse_released },
{ "IsMouseClicked", l_pigui_is_mouse_clicked },
{ "IsMouseDoubleClicked", l_pigui_is_mouse_doubleclicked },
{ "IsMouseDown", l_pigui_is_mouse_down },
{ "IsMouseHoveringRect", l_pigui_is_mouse_hovering_rect },
{ "IsWindowHovered", l_pigui_is_window_hovered },
Expand Down
X Tutup