otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update ImGui to 1.89.8

Browse source 
commit f8704cd085c4347f835c21dc12a3951924143872
with Furnace patches
This commit is contained in:
tildearrow 2023-08-30 00:42:51 -05:00
parent 23a1fd4796
commit 5da54a7678
61 changed files with 1926 additions and 883 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gui/mixer.cpp
View file

@ -105,7 +105,7 @@ bool FurnaceGUI::portSet(String label, unsigned int portSetID, int ins, int outs
bool hovered=false;
bool active=false;
if (visible) {
hovered=ImGui::ItemHoverable(rect,ImGui::GetID(portID.c_str()));
hovered=ImGui::ItemHoverable(rect,ImGui::GetID(portID.c_str()),0);
active=(hovered && ImGui::IsMouseClicked(ImGuiMouseButton_Left));
if (hovered && ImGui::IsMouseClicked(ImGuiMouseButton_Right)) {

10
src/gui/pattern.cpp
View file

@ -623,7 +623,7 @@ void FurnaceGUI::drawPattern() {
case 0: // classic
ImGui::ItemSize(size,ImGui::GetStyle().FramePadding.y);
if (ImGui::ItemAdd(rect,ImGui::GetID(chanID))) {
bool hovered=ImGui::ItemHoverable(rect,ImGui::GetID(chanID));
bool hovered=ImGui::ItemHoverable(rect,ImGui::GetID(chanID),0);
ImU32 col=(hovered || (mobileUI && ImGui::IsMouseDown(ImGuiMouseButton_Left)))?ImGui::GetColorU32(ImGuiCol_HeaderHovered):ImGui::GetColorU32(ImGuiCol_Header);
dl->AddRectFilled(rect.Min,rect.Max,col);
dl->AddText(ImVec2(minLabelArea.x,rect.Min.y),ImGui::GetColorU32(channelTextColor(i)),chanID);
@ -632,7 +632,7 @@ void FurnaceGUI::drawPattern() {
case 1: { // line
ImGui::ItemSize(size,ImGui::GetStyle().FramePadding.y);
if (ImGui::ItemAdd(rect,ImGui::GetID(chanID))) {
bool hovered=ImGui::ItemHoverable(rect,ImGui::GetID(chanID));
bool hovered=ImGui::ItemHoverable(rect,ImGui::GetID(chanID),0);
ImU32 fadeCol0=ImGui::GetColorU32(ImVec4(
chanHeadBase.x,
chanHeadBase.y,
@ -654,7 +654,7 @@ void FurnaceGUI::drawPattern() {
case 2: { // round
ImGui::ItemSize(size,ImGui::GetStyle().FramePadding.y);
if (ImGui::ItemAdd(rect,ImGui::GetID(chanID))) {
bool hovered=ImGui::ItemHoverable(rect,ImGui::GetID(chanID));
bool hovered=ImGui::ItemHoverable(rect,ImGui::GetID(chanID),0);
ImU32 fadeCol0=ImGui::GetColorU32(ImVec4(
chanHeadBase.x,
chanHeadBase.y,
@ -690,7 +690,7 @@ void FurnaceGUI::drawPattern() {
case 4: { // square border
ImGui::ItemSize(size,ImGui::GetStyle().FramePadding.y);
if (ImGui::ItemAdd(rect,ImGui::GetID(chanID))) {
bool hovered=ImGui::ItemHoverable(rect,ImGui::GetID(chanID));
bool hovered=ImGui::ItemHoverable(rect,ImGui::GetID(chanID),0);
ImU32 fadeCol=ImGui::GetColorU32(ImVec4(
chanHeadBase.x,
chanHeadBase.y,
@ -711,7 +711,7 @@ void FurnaceGUI::drawPattern() {
case 5: { // round border
ImGui::ItemSize(size,ImGui::GetStyle().FramePadding.y);
if (ImGui::ItemAdd(rect,ImGui::GetID(chanID))) {
bool hovered=ImGui::ItemHoverable(rect,ImGui::GetID(chanID));
bool hovered=ImGui::ItemHoverable(rect,ImGui::GetID(chanID),0);
ImU32 fadeCol=ImGui::GetColorU32(ImVec4(
chanHeadBase.x,
chanHeadBase.y,

2
src/gui/piano.cpp
View file

@ -228,7 +228,7 @@ void FurnaceGUI::drawPiano() {
//ImGui::ItemSize(size,ImGui::GetStyle().FramePadding.y);
if (ImGui::ItemAdd(rect,ImGui::GetID("pianoDisplay"))) {
bool canInput=false;
if (!pianoReadonly && ImGui::ItemHoverable(rect,ImGui::GetID("pianoDisplay"))) {
if (!pianoReadonly && ImGui::ItemHoverable(rect,ImGui::GetID("pianoDisplay"),0)) {
canInput=true;
ImGui::InhibitInertialScroll();
}

6
src/gui/plot_nolerp.cpp
View file

@ -78,7 +78,7 @@ int PlotNoLerpEx(ImGuiPlotType plot_type, const char* label, float (*values_gett
ImGui::ItemSize(total_bb, style.FramePadding.y);
if (!ImGui::ItemAdd(total_bb, 0, &frame_bb, ImGuiItemFlags_NoInertialScroll))
return -1;
const bool hovered = ImGui::ItemHoverable(frame_bb, id);
const bool hovered = ImGui::ItemHoverable(frame_bb, id, 0);
// Determine scale from values if not specified
if (scale_min == FLT_MAX || scale_max == FLT_MAX)
@ -205,7 +205,7 @@ int PlotBitfieldEx(const char* label, int (*values_getter)(void* data, int idx),
ImGui::ItemSize(total_bb, style.FramePadding.y);
if (!ImGui::ItemAdd(total_bb, 0, &frame_bb, ImGuiItemFlags_NoInertialScroll))
return -1;
const bool hovered = ImGui::ItemHoverable(frame_bb, id);
const bool hovered = ImGui::ItemHoverable(frame_bb, id, 0);
ImGui::RenderFrame(frame_bb.Min, frame_bb.Max, ImGui::GetColorU32(ImGuiCol_FrameBg), true, style.FrameRounding);
@ -315,7 +315,7 @@ int PlotCustomEx(ImGuiPlotType plot_type, const char* label, float (*values_gett
ImGui::ItemSize(total_bb, style.FramePadding.y);
if (!ImGui::ItemAdd(total_bb, 0, &frame_bb, ImGuiItemFlags_NoInertialScroll))
return -1;
const bool hovered = ImGui::ItemHoverable(frame_bb, id);
const bool hovered = ImGui::ItemHoverable(frame_bb, id, 0);
// Determine scale from values if not specified
if (scale_min == FLT_MAX || scale_max == FLT_MAX)