procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 09:23:24 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

Merge branch 'wip/martymichal/container-popup-predictable-sizing' into 'master'

Browse source 
app: Use correct maximum size for button viewables

Closes Teams/GIMP/Design/gimp-ux#509 and #14337

See merge request GNOME/gimp!2353
This commit is contained in:
Ondřej Míchal 2025-07-02 20:25:57 +03:00
commit 019f35ca15
5 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/core/gimpviewable.h
View file

@ -27,7 +27,7 @@
#define GIMP_VIEWABLE_MAX_PREVIEW_SIZE 2048 #define GIMP_VIEWABLE_MAX_PREVIEW_SIZE 2048
#define GIMP_VIEWABLE_MAX_POPUP_SIZE 256 #define GIMP_VIEWABLE_MAX_POPUP_SIZE 256
#define GIMP_VIEWABLE_MAX_BUTTON_SIZE 64 #define GIMP_VIEWABLE_MAX_BUTTON_SIZE GIMP_VIEW_SIZE_GIGANTIC
#define GIMP_VIEWABLE_MAX_MENU_SIZE 48 #define GIMP_VIEWABLE_MAX_MENU_SIZE 48

9
app/widgets/gimpcontainerpopup.c
View file

@ -32,6 +32,7 @@
#include "core/gimpcontext.h" #include "core/gimpcontext.h"
#include "core/gimpcontainer.h" #include "core/gimpcontainer.h"
#include "core/gimpviewable.h" #include "core/gimpviewable.h"
#include "core/gimp-utils.h"
#include "gimpcontainerbox.h" #include "gimpcontainerbox.h"
#include "gimpcontainereditor.h" #include "gimpcontainereditor.h"
@ -213,7 +214,7 @@ gimp_container_popup_set_view_type (GimpContainerPopup *popup,
} }
} }
gint GimpViewSize
gimp_container_popup_get_view_size (GimpContainerPopup *popup) gimp_container_popup_get_view_size (GimpContainerPopup *popup)
{ {
g_return_val_if_fail (GIMP_IS_CONTAINER_POPUP (popup), GIMP_VIEW_SIZE_SMALL); g_return_val_if_fail (GIMP_IS_CONTAINER_POPUP (popup), GIMP_VIEW_SIZE_SMALL);
@ -223,7 +224,7 @@ gimp_container_popup_get_view_size (GimpContainerPopup *popup)
void void
gimp_container_popup_set_view_size (GimpContainerPopup *popup, gimp_container_popup_set_view_size (GimpContainerPopup *popup,
gint view_size) GimpViewSize view_size)
{ {
GtkWidget *scrolled_win; GtkWidget *scrolled_win;
GtkWidget *viewport; GtkWidget *viewport;
@ -366,7 +367,7 @@ gimp_container_popup_smaller_clicked (GtkWidget *button,
view_size = gimp_container_view_get_view_size (popup->editor->view, NULL); view_size = gimp_container_view_get_view_size (popup->editor->view, NULL);
gimp_container_popup_set_view_size (popup, view_size * 0.8); gimp_container_popup_set_view_size (popup, gimp_view_size_get_smaller (view_size));
} }
static void static void
@ -377,7 +378,7 @@ gimp_container_popup_larger_clicked (GtkWidget *button,
view_size = gimp_container_view_get_view_size (popup->editor->view, NULL); view_size = gimp_container_view_get_view_size (popup->editor->view, NULL);
gimp_container_popup_set_view_size (popup, view_size * 1.2); gimp_container_popup_set_view_size (popup, gimp_view_size_get_larger (view_size));
} }
static void static void

4
app/widgets/gimpcontainerpopup.h
View file

@ -80,9 +80,9 @@ GimpViewType gimp_container_popup_get_view_type (GimpContainerPopup *popup);
void gimp_container_popup_set_view_type (GimpContainerPopup *popup, void gimp_container_popup_set_view_type (GimpContainerPopup *popup,
GimpViewType view_type); GimpViewType view_type);
gint gimp_container_popup_get_view_size (GimpContainerPopup *popup); GimpViewSize gimp_container_popup_get_view_size (GimpContainerPopup *popup);
void gimp_container_popup_set_view_size (GimpContainerPopup *popup, void gimp_container_popup_set_view_size (GimpContainerPopup *popup,
gint view_size); GimpViewSize view_size);
#endif /* __GIMP_CONTAINER_POPUP_H__ */ #endif /* __GIMP_CONTAINER_POPUP_H__ */

2
app/widgets/gimpviewablebutton.c
View file

@ -351,7 +351,7 @@ gimp_viewable_button_get_view_size (GimpViewableButton *button)
void void
gimp_viewable_button_set_view_size (GimpViewableButton *button, gimp_viewable_button_set_view_size (GimpViewableButton *button,
gint view_size) GimpViewSize view_size)
{ {
g_return_if_fail (GIMP_IS_VIEWABLE_BUTTON (button)); g_return_if_fail (GIMP_IS_VIEWABLE_BUTTON (button));

2
app/widgets/gimpviewablebutton.h
View file

@ -78,7 +78,7 @@ void gimp_viewable_button_set_view_type (GimpViewableButton *button,
gint gimp_viewable_button_get_view_size (GimpViewableButton *button); gint gimp_viewable_button_get_view_size (GimpViewableButton *button);
void gimp_viewable_button_set_view_size (GimpViewableButton *button, void gimp_viewable_button_set_view_size (GimpViewableButton *button,
gint view_size); GimpViewSize view_size);
#endif /* __GIMP_VIEWABLE_BUTTON_H__ */ #endif /* __GIMP_VIEWABLE_BUTTON_H__ */