lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

imagePage: Move popover out of LpImage

Browse source 
It cause 'not measured' errors and we have enough
things to handle in LpImage already.

Part-of: <https://gitlab.gnome.org/Incubator/loupe/-/merge_requests/146>
This commit is contained in:
Sophie Herold 2023-03-18 01:22:30 +01:00 • committed by Christopher Davis
parent f33c4bd470
commit 0e24f347e6
3 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

80
data/gtk/image_page.ui
View file

@ -57,51 +57,55 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkScrolledWindow" id="scrolled_window"> <object class="GtkBox" id="image_stack_page">
<property name="propagate-natural-height">True</property> <child>
<property name="propagate-natural-width">True</property> <object class="GtkScrolledWindow" id="scrolled_window">
<property name="child"> <property name="propagate-natural-height">True</property>
<object class="LpImage" id="image"> <property name="propagate-natural-width">True</property>
<child> <property name="child">
<object class="GtkGestureClick" id="right_click_gesture"> <object class="LpImage" id="image">
<property name="button">3</property> <child>
</object> <object class="GtkGestureClick" id="right_click_gesture">
</child> <property name="button">3</property>
<child>
<object class="GtkGestureLongPress" id="press_gesture">
<property name="touch-only">True</property>
</object>
</child>
<child>
<object class="GtkPopoverMenu" id="popover">
<property name="has-arrow">False</property>
<property name="menu-model">image_menu</property>
<child type="rotate-left">
<object class="GtkButton">
<property name="icon-name">object-rotate-left-symbolic</property>
<property name="tooltip-text" translatable="yes">Rotate Left</property>
<property name="action-name">win.rotate</property>
<property name="action-target">-90.0</property>
<style>
<class name="flat" />
</style>
</object> </object>
</child> </child>
<child type="rotate-right"> <child>
<object class="GtkButton"> <object class="GtkGestureLongPress" id="press_gesture">
<property name="icon-name">object-rotate-right-symbolic</property> <property name="touch-only">True</property>
<property name="tooltip-text" translatable="yes">Rotate Right</property>
<property name="action-name">win.rotate</property>
<property name="action-target">90.0</property>
<style>
<class name="flat" />
</style>
</object> </object>
</child> </child>
</object> </object>
</property>
</object>
</child>
<child>
<object class="GtkPopoverMenu" id="popover">
<property name="has-arrow">False</property>
<property name="menu-model">image_menu</property>
<child type="rotate-left">
<object class="GtkButton">
<property name="icon-name">object-rotate-left-symbolic</property>
<property name="tooltip-text" translatable="yes">Rotate Left</property>
<property name="action-name">win.rotate</property>
<property name="action-target">-90.0</property>
<style>
<class name="flat" />
</style>
</object>
</child>
<child type="rotate-right">
<object class="GtkButton">
<property name="icon-name">object-rotate-right-symbolic</property>
<property name="tooltip-text" translatable="yes">Rotate Right</property>
<property name="action-name">win.rotate</property>
<property name="action-target">90.0</property>
<style>
<class name="flat" />
</style>
</object>
</child> </child>
</object> </object>
</property> </child>
</object> </object>
</child> </child>
</object> </object>

4
src/widgets/image.rs
View file

@ -269,10 +269,6 @@ mod imp {
.set_target(&adw::CallbackAnimationTarget::new(|_| {})); .set_target(&adw::CallbackAnimationTarget::new(|_| {}));
obj.zoom_animation() obj.zoom_animation()
.set_target(&adw::CallbackAnimationTarget::new(|_| {})); .set_target(&adw::CallbackAnimationTarget::new(|_| {}));
while let Some(child) = obj.first_child() {
child.unparent();
}
} }
} }

4
src/widgets/image_page.rs
View file

@ -46,7 +46,7 @@ mod imp {
#[template_child] #[template_child]
pub(super) error_page: TemplateChild<adw::StatusPage>, pub(super) error_page: TemplateChild<adw::StatusPage>,
#[template_child] #[template_child]
pub(super) scrolled_window: TemplateChild<gtk::ScrolledWindow>, pub(super) image_stack_page: TemplateChild<gtk::Widget>,
#[template_child] #[template_child]
pub(super) image: TemplateChild<LpImage>, pub(super) image: TemplateChild<LpImage>,
#[template_child] #[template_child]
@ -115,7 +115,7 @@ mod imp {
if obj.image().is_loaded() { if obj.image().is_loaded() {
obj.imp() obj.imp()
.stack .stack
.set_visible_child(&*obj.imp().scrolled_window); .set_visible_child(&*obj.imp().image_stack_page);
} }
}), }),
); );