@@ -163,8 +163,7 @@ export {
163
163
std::string name;
164
164
165
165
std::vector<math::Extent2<u32>> extents;
166
-
167
- void* handle = nullptr;
166
+ u32 scale_factor = 1;
168
167
169
168
[[nodiscard]]
170
169
constexpr auto operator<=>(const Monitor& other) const noexcept -> std::strong_ordering;
@@ -205,7 +204,7 @@ export {
205
204
206
205
struct ResizedEventData {
207
206
static constexpr auto TYPE = EventType::RESIZED;
208
- math::Extent2<u32> extent;
207
+ math::Extent2<u32> extent;
209
208
};
210
209
211
210
struct MinimizedEventData {
@@ -230,13 +229,13 @@ export {
230
229
231
230
struct MouseButtonPushedEventData {
232
231
static constexpr auto TYPE = EventType::MOUSE_BUTTON_PUSHED;
233
- math::vec2i position;
232
+ math::vec2i position;
234
233
MouseButton button;
235
234
};
236
235
237
236
struct MouseButtonReleasedEventData {
238
237
static constexpr auto TYPE = EventType::MOUSE_BUTTON_RELEASED;
239
- math::vec2i position;
238
+ math::vec2i position;
240
239
MouseButton button;
241
240
};
242
241
@@ -250,7 +249,7 @@ export {
250
249
251
250
struct MouseMovedEventData {
252
251
static constexpr auto TYPE = EventType::MOUSE_MOVED;
253
- math::vec2i position;
252
+ math::vec2i position;
254
253
};
255
254
256
255
struct LostFocusEventData {
@@ -290,8 +289,9 @@ export {
290
289
Window(Window&&);
291
290
auto operator=(Window&&) -> Window&;
292
291
293
- auto create(std::string title, const math::Extent2<u32>& size, WindowStyle style) noexcept
294
- -> void;
292
+ auto create(std::string title,
293
+ const math::Extent2<u32>& size,
294
+ WindowStyle style) noexcept -> void;
295
295
auto close() noexcept -> void;
296
296
297
297
[[nodiscard]]
@@ -339,8 +339,7 @@ export {
339
339
auto toggle_virtual_keyboard_visibility(bool visible) noexcept -> void;
340
340
341
341
auto set_mouse_position(const math::vec2i& position) noexcept -> void;
342
- static auto set_mouse_position_on_desktop(const math::vec2u& position) noexcept
343
- -> void;
342
+ static auto set_mouse_position_on_desktop(const math::vec2u& position) noexcept -> void;
344
343
345
344
[[nodiscard]]
346
345
static auto get_monitor_settings() -> std::vector<Monitor>;
@@ -398,10 +397,11 @@ export {
398
397
////////////////////////////////////////////////////////////////////
399
398
400
399
ASCASTER_STRICT_DEFINE(std::string, stormkit::wsi::Monitor) {
401
- return std::format("[Monitor: flags = {}, name = {}, extents = {}]",
400
+ return std::format("[Monitor: flags = {}, name = {}, extents = {}, scale = {} ]",
402
401
from.flags,
403
402
from.name,
404
- from.extents);
403
+ from.extents,
404
+ from.scale_factor);
405
405
}
406
406
407
407
namespace stormkit { namespace wsi {
0 commit comments