1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-06 05:12:55 +08:00

Merge branch 'tooltips' of github.com:Jorolf/osu into tooltips

This commit is contained in:
Jorolf 2017-04-17 17:43:54 +02:00
commit 906d68936a
2 changed files with 1 additions and 3 deletions

View File

@ -47,7 +47,6 @@ namespace osu.Desktop.VisualTests.Tests
},
};
slider.Current.BindTo(new BindableInt(5)
{
MaxValue = 10,
@ -72,7 +71,6 @@ namespace osu.Desktop.VisualTests.Tests
}
};
}
}
private class TooltipTextbox : OsuTextBox, IHasTooltip

View File

@ -134,7 +134,7 @@ namespace osu.Game.Graphics.Cursor
Texture = textures.Get(@"Cursor/menu-cursor-additive"),
},
}
},
}
};
cursorScale = config.GetBindable<double>(OsuConfig.MenuCursorSize);