Merge remote-tracking branch 'upstream/master' into center

This commit is contained in:
Dorota Czaplejewicz
2020-02-05 10:32:01 +00:00
24 changed files with 310 additions and 87 deletions

View File

@ -37,6 +37,7 @@ mod c {
);
}
/// Draws all buttons that are not in the base state
#[no_mangle]
pub extern "C"
fn squeek_layout_draw_all_changed(
@ -49,12 +50,13 @@ mod c {
layout.foreach_visible_button(|offset, button| {
let state = RefCell::borrow(&button.state).clone();
if state.pressed == keyboard::PressType::Pressed || state.locked {
let locked = state.action.is_active(&layout.current_view);
if state.pressed == keyboard::PressType::Pressed || locked {
render_button_at_position(
renderer, &cr,
offset,
button.as_ref(),
state.pressed, state.locked,
state.pressed, locked,
);
}
})