mirror of
https://github.com/ArthurSonzogni/FTXUI.git
synced 2025-09-29 16:39:34 +08:00
Merge dom and component focus (#978)
Instead of two levels of focus with `focus` and `selected`, use a recursive level. The components set the one "active" and hbox/vbox/dbox Co-authored-by: ArthurSonzogni <sonzogniarthur@gmail.com>
This commit is contained in:
@@ -60,17 +60,17 @@ TEST(SliderTest, Right) {
|
||||
EXPECT_EQ(value, 50);
|
||||
EXPECT_EQ(updated, 0);
|
||||
EXPECT_TRUE(slider->OnEvent(MousePressed(3, 0)));
|
||||
EXPECT_EQ(value, 50);
|
||||
EXPECT_EQ(updated, 0);
|
||||
EXPECT_EQ(value, 30);
|
||||
EXPECT_EQ(updated, 1);
|
||||
EXPECT_TRUE(slider->OnEvent(MousePressed(9, 0)));
|
||||
EXPECT_EQ(value, 90);
|
||||
EXPECT_EQ(updated, 1);
|
||||
EXPECT_EQ(updated, 2);
|
||||
EXPECT_TRUE(slider->OnEvent(MousePressed(9, 2)));
|
||||
EXPECT_EQ(value, 90);
|
||||
EXPECT_EQ(updated, 1);
|
||||
EXPECT_EQ(updated, 2);
|
||||
EXPECT_TRUE(slider->OnEvent(MousePressed(5, 2)));
|
||||
EXPECT_EQ(value, 50);
|
||||
EXPECT_EQ(updated, 2);
|
||||
EXPECT_EQ(updated, 3);
|
||||
EXPECT_TRUE(slider->OnEvent(MouseReleased(5, 2)));
|
||||
EXPECT_FALSE(slider->OnEvent(MousePressed(5, 2)));
|
||||
EXPECT_EQ(value, 50);
|
||||
@@ -92,17 +92,17 @@ TEST(SliderTest, Left) {
|
||||
EXPECT_EQ(value, 50);
|
||||
EXPECT_EQ(updated, 0);
|
||||
EXPECT_TRUE(slider->OnEvent(MousePressed(3, 0)));
|
||||
EXPECT_EQ(value, 50);
|
||||
EXPECT_EQ(updated, 0);
|
||||
EXPECT_EQ(value, 70);
|
||||
EXPECT_EQ(updated, 1);
|
||||
EXPECT_TRUE(slider->OnEvent(MousePressed(9, 0)));
|
||||
EXPECT_EQ(value, 10);
|
||||
EXPECT_EQ(updated, 1);
|
||||
EXPECT_EQ(updated, 2);
|
||||
EXPECT_TRUE(slider->OnEvent(MousePressed(9, 2)));
|
||||
EXPECT_EQ(value, 10);
|
||||
EXPECT_EQ(updated, 1);
|
||||
EXPECT_EQ(updated, 2);
|
||||
EXPECT_TRUE(slider->OnEvent(MousePressed(5, 2)));
|
||||
EXPECT_EQ(value, 50);
|
||||
EXPECT_EQ(updated, 2);
|
||||
EXPECT_EQ(updated, 3);
|
||||
EXPECT_TRUE(slider->OnEvent(MouseReleased(5, 2)));
|
||||
EXPECT_FALSE(slider->OnEvent(MousePressed(5, 2)));
|
||||
EXPECT_EQ(value, 50);
|
||||
@@ -124,21 +124,21 @@ TEST(SliderTest, Down) {
|
||||
EXPECT_EQ(value, 50);
|
||||
EXPECT_EQ(updated, 0);
|
||||
EXPECT_TRUE(slider->OnEvent(MousePressed(0, 3)));
|
||||
EXPECT_EQ(value, 50);
|
||||
EXPECT_EQ(updated, 0);
|
||||
EXPECT_EQ(value, 30);
|
||||
EXPECT_EQ(updated, 1);
|
||||
EXPECT_TRUE(slider->OnEvent(MousePressed(0, 9)));
|
||||
EXPECT_EQ(value, 90);
|
||||
EXPECT_EQ(updated, 1);
|
||||
EXPECT_EQ(updated, 2);
|
||||
EXPECT_TRUE(slider->OnEvent(MousePressed(2, 9)));
|
||||
EXPECT_EQ(value, 90);
|
||||
EXPECT_EQ(updated, 1);
|
||||
EXPECT_EQ(updated, 2);
|
||||
EXPECT_TRUE(slider->OnEvent(MousePressed(2, 5)));
|
||||
EXPECT_EQ(value, 50);
|
||||
EXPECT_EQ(updated, 2);
|
||||
EXPECT_EQ(updated, 3);
|
||||
EXPECT_TRUE(slider->OnEvent(MouseReleased(2, 5)));
|
||||
EXPECT_FALSE(slider->OnEvent(MousePressed(2, 5)));
|
||||
EXPECT_EQ(value, 50);
|
||||
EXPECT_EQ(updated, 2);
|
||||
EXPECT_EQ(updated, 3);
|
||||
}
|
||||
|
||||
TEST(SliderTest, Up) {
|
||||
@@ -157,17 +157,17 @@ TEST(SliderTest, Up) {
|
||||
EXPECT_EQ(value, 50);
|
||||
EXPECT_EQ(updated, 0);
|
||||
EXPECT_TRUE(slider->OnEvent(MousePressed(0, 3)));
|
||||
EXPECT_EQ(value, 50);
|
||||
EXPECT_EQ(updated, 0);
|
||||
EXPECT_EQ(value, 70);
|
||||
EXPECT_EQ(updated, 1);
|
||||
EXPECT_TRUE(slider->OnEvent(MousePressed(0, 9)));
|
||||
EXPECT_EQ(value, 10);
|
||||
EXPECT_EQ(updated, 1);
|
||||
EXPECT_EQ(updated, 2);
|
||||
EXPECT_TRUE(slider->OnEvent(MousePressed(2, 9)));
|
||||
EXPECT_EQ(value, 10);
|
||||
EXPECT_EQ(updated, 1);
|
||||
EXPECT_EQ(updated, 2);
|
||||
EXPECT_TRUE(slider->OnEvent(MousePressed(2, 5)));
|
||||
EXPECT_EQ(value, 50);
|
||||
EXPECT_EQ(updated, 2);
|
||||
EXPECT_EQ(updated, 3);
|
||||
EXPECT_TRUE(slider->OnEvent(MouseReleased(2, 5)));
|
||||
EXPECT_FALSE(slider->OnEvent(MousePressed(2, 5)));
|
||||
EXPECT_EQ(value, 50);
|
||||
|
Reference in New Issue
Block a user