Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ default = []
serde = ["dep:serde", "egui/serde"]

[dependencies]
egui = { version = "0.32", default-features = false }
egui = { version = "0.33", default-features = false }
serde = { version = "1", optional = true, features = ["derive"] }

duplicate = "2.0"
paste = "1.0"

[dev-dependencies]
eframe = { version = "0.32", default-features = false, features = [
eframe = { version = "0.33", default-features = false, features = [
"default",
"default_fonts",
"glow",
Expand Down
6 changes: 3 additions & 3 deletions src/widgets/dock_area/drag_and_drop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ enum LockState {
/// Lock remains locked, but can be unlocked.
SoftLock,

/// Lock is locked forever.
/// Lock is locked forever.
HardLock,
}

Expand Down Expand Up @@ -451,12 +451,12 @@ fn draw_window_rect(rect: Rect, ui: &Ui, style: &Style) {
fn constrain_rect_to_area(ui: &Ui, rect: Rect, mut bounds: Rect) -> Rect {
if rect.width() > bounds.width() {
// Allow overlapping side bars.
let screen_rect = ui.ctx().screen_rect();
let screen_rect = ui.ctx().content_rect();
(bounds.min.x, bounds.max.x) = (screen_rect.min.x, screen_rect.max.x);
}
if rect.height() > bounds.height() {
// Allow overlapping top/bottom bars:
let screen_rect = ui.ctx().screen_rect();
let screen_rect = ui.ctx().content_rect();
(bounds.min.y, bounds.max.y) = (screen_rect.min.y, screen_rect.max.y);
}

Expand Down
2 changes: 1 addition & 1 deletion src/widgets/dock_area/show/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ impl<Tab> DockArea<'_, Tab> {
pub fn show_inside(mut self, ui: &mut Ui, tab_viewer: &mut impl TabViewer<Tab = Tab>) {
self.style
.get_or_insert(Style::from_egui(ui.style().as_ref()));
self.window_bounds.get_or_insert(ui.ctx().screen_rect());
self.window_bounds.get_or_insert(ui.ctx().content_rect());

let mut state = State::load(ui.ctx(), self.id);

Expand Down
Loading