Skip to content

Commit e43851d

Browse files
committed
keybinds
1 parent 615bc19 commit e43851d

File tree

13 files changed

+174
-22
lines changed

13 files changed

+174
-22
lines changed

sources/gui/widgets/button.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class GuiTestImpl : public GuiTestClass
4545
p.order = index++;
4646
e->value<GuiButtonComponent>();
4747
e->value<GuiTextComponent>().value = "text";
48-
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"press me">();
48+
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<0, "press me">();
4949
e->value<GuiTooltipComponent>().delay = 1000;
5050
}
5151

sources/gui/widgets/checkBox.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class GuiTestImpl : public GuiTestClass
2323
p.parent = 3;
2424
p.order = index++;
2525
e->value<GuiCheckBoxComponent>();
26-
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"yes or no, that is the question">();
26+
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<0, "yes or no, that is the question">();
2727
}
2828

2929
{ // with label

sources/gui/widgets/comboBox.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class GuiTestImpl : public GuiTestClass
3232
p.order = index++;
3333
e->value<GuiComboBoxComponent>();
3434
e->value<GuiTextComponent>().value = "placeholder";
35-
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"nothing to choose from?">();
35+
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<0, "nothing to choose from?">();
3636
}
3737
{ // items
3838
guiLabel(3, index, "items");
@@ -59,7 +59,7 @@ class GuiTestImpl : public GuiTestClass
5959
p.order = index++;
6060
e->value<GuiComboBoxComponent>().selected = 2;
6161
e->value<GuiTextComponent>().value = "select one:";
62-
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"select one">();
62+
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<0, "select one">();
6363
for (uint32 i = 0; i < 4; i++)
6464
{
6565
Entity *o = ents->createUnique();
@@ -79,7 +79,7 @@ class GuiTestImpl : public GuiTestClass
7979
e->value<GuiComboBoxComponent>();
8080
e->value<GuiWidgetStateComponent>().disabled = true;
8181
e->value<GuiTextComponent>().value = "select one:";
82-
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"select one">();
82+
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<0, "select one">();
8383
for (uint32 i = 0; i < 4; i++)
8484
{
8585
Entity *o = ents->createUnique();
@@ -98,7 +98,7 @@ class GuiTestImpl : public GuiTestClass
9898
p.order = index++;
9999
e->value<GuiComboBoxComponent>();
100100
e->value<GuiTextComponent>().value = "select one:";
101-
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"select one">();
101+
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<0, "select one">();
102102
for (uint32 i = 0; i < 4; i++)
103103
{
104104
Entity *o = ents->createUnique();

sources/gui/widgets/input.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class GuiTestImpl : public GuiTestClass
4949
ib.min.f = -1;
5050
ib.max.f = 1;
5151
ib.step.f = 0.1;
52-
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"range -1 .. 1">();
52+
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<0, "range -1 .. 1">();
5353
}
5454

5555
{ // password
@@ -90,7 +90,7 @@ class GuiTestImpl : public GuiTestClass
9090
p.order = index++;
9191
e->value<GuiInputComponent>();
9292
e->value<GuiWidgetStateComponent>().disabled = true;
93-
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"this widget may not show tooltip">();
93+
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<0, "this widget may not show tooltip">();
9494
e->value<GuiTooltipComponent>().enableForDisabled = false;
9595
}
9696

@@ -102,7 +102,7 @@ class GuiTestImpl : public GuiTestClass
102102
p.order = index++;
103103
e->value<GuiInputComponent>();
104104
e->value<GuiWidgetStateComponent>().disabled = true;
105-
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"this widget should show tooltip">();
105+
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<0, "this widget should show tooltip">();
106106
e->value<GuiTooltipComponent>().enableForDisabled = true;
107107
}
108108
}

sources/gui/widgets/label.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class GuiTestImpl : public GuiTestClass
3434
p.order = index++;
3535
e->value<GuiLabelComponent>();
3636
e->value<GuiTextComponent>().value = "hover over this";
37-
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"How are you doing?">();
37+
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<0, "How are you doing?">();
3838
}
3939

4040
{ // with asset tooltip
@@ -96,7 +96,7 @@ class GuiTestImpl : public GuiTestClass
9696
m.textureName = HashString("cage/texture/helper.jpg");
9797
m.textureUvOffset = Vec2(5 / 8.f, 2 / 8.f);
9898
m.textureUvSize = Vec2(1 / 8.f, 1 / 8.f);
99-
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"helper.jpg">();
99+
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<0, "helper.jpg">();
100100
}
101101
}
102102
};

sources/gui/widgets/progressBar.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class GuiTestImpl : public GuiTestClass
3030
p.parent = 3;
3131
p.order = index++;
3232
e->value<GuiProgressBarComponent>();
33-
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"some progress is being made">();
33+
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<0, "some progress is being made">();
3434
}
3535

3636
{ // progressed

sources/gui/widgets/radioBox.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class GuiTestImpl : public GuiTestClass
2323
p.parent = 3;
2424
p.order = index++;
2525
e->value<GuiRadioBoxComponent>();
26-
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"this widget is called radio box, yet it has nothing to do with music">();
26+
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<0, "this widget is called radio box, yet it has nothing to do with music">();
2727
}
2828

2929
{ // with label

sources/gui/widgets/sliderBar.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class GuiTestImpl : public GuiTestClass
2323
p.parent = 3;
2424
p.order = index++;
2525
e->value<GuiSliderBarComponent>();
26-
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"move me all the way to the right">();
26+
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<0, "move me all the way to the right">();
2727
envelopeInScrollbars(e);
2828
}
2929

sources/gui/widgets/textArea.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Nulla et ipsum ligula. Nunc tristique ut felis in tristique. Suspendisse sit ame
4343
p.parent = 3;
4444
p.order = index++;
4545
e->value<GuiTextAreaComponent>().buffer = &buffer;
46-
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"tooltip: in case you need more text for this text">();
46+
e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<0, "tooltip: in case you need more text for this text">();
4747
}
4848

4949
{ // disabled

0 commit comments

Comments
 (0)