liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Solving issue #3531, assign classes to Gtk::Window and MyWidget

Browse Source 
- Curve editor buttons are set to expand by default, but they are set to
shrink as soon as an accompagnying widget is set to expand
- White Balance's method button now has a centered ellipse ("...")
- White Balance's buttons are now aligned on their right
- A "withScrollbar" class is added to MyExpander if the ToolPanel's
vertical scrollbar is visible. This can let you add padding space for
the scrollbar (see #MyExpander.withScrollbar in RT default theme)
- A "maximized" and "fullscreen" class is added to the RTWindow whenever
it change state ; BEWARE: if you maximize the window then make it
fullscreen, Gtk says that the window is in a "maximized & fullscreen"
state, which mean that both class can be added at the same time to the
window.

One Gtk oddity (at least on Windows) is that you can make your window
fullscreen and still drag it around by its header bar... That's not very
practical to click on the unfullscreen button if in Single Editor mode
with vertical Tab.

I also managed to see the window in a Inconified + Maximized state. This
part of Gtk doesn't seem very robust, on Windows at least.
This commit is contained in:
Hombre
2016-12-20 01:58:37 +01:00
parent 5100126f0d
commit c7be386c3a
14 changed files with 129 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
rtgui/rtwindow.cc
View File

@@ -133,6 +133,7 @@ RTWindow::RTWindow ()
if (options.windowMaximized) {
maximize();
get_style_context()->add_class("maximized");
} else {
unmaximize();
move(options.windowX, options.windowY);
@@ -385,14 +386,48 @@ void RTWindow::on_realize ()
bool RTWindow::on_window_state_event(GdkEventWindowState* event)
{
const int new_window_state = event->new_window_state & ~GDK_WINDOW_STATE_FOCUSED;
/*
printf("Window state event: %s%s%s%s%s%s%s%s%s\n",
event->new_window_state & GDK_WINDOW_STATE_WITHDRAWN ? "Withdrawn" : "",
event->new_window_state & GDK_WINDOW_STATE_ICONIFIED ? " Iconified" : "",
event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED ? " Maximized" : "",
event->new_window_state & GDK_WINDOW_STATE_STICKY ? " Sticky" : "",
event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN ? " Fullscreen" : "",
event->new_window_state & GDK_WINDOW_STATE_ABOVE ? " Above" : "",
event->new_window_state & GDK_WINDOW_STATE_BELOW ? " Below" : "",
event->new_window_state & GDK_WINDOW_STATE_FOCUSED ? " Focused" : "",
event->new_window_state & GDK_WINDOW_STATE_TILED ? " Tiled" : ""
);
*/
if (!new_window_state) {
// Window mode
options.windowMaximized = false;
} else if (new_window_state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN | GDK_WINDOW_STATE_ICONIFIED)) {
// Fullscreen mode, save this mode even when window is iconified (minimized) to allow easier restore, not the best solution though...
options.windowMaximized = true;
// Return if we get iconified
if (event->new_window_state & GDK_WINDOW_STATE_ICONIFIED) {
return true;
}
// Then looking for evolutions of GDK_WINDOW_STATE_FULLSCREEN & GDK_WINDOW_STATE_MAXIMIZED only
bool isFullScreen = event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN;
bool isMaximized = event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED;
bool switchFullScreen = event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN;
bool switchMaximized = event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED;
if (switchFullScreen) {
// Fullscreen mode
if (isFullScreen) {
get_style_context()->add_class("fullscreen");
} else {
get_style_context()->remove_class("fullscreen");
}
}
if (switchMaximized) {
// Maximized mode
if (isMaximized) {
options.windowMaximized = true;
get_style_context()->add_class("maximized");
} else {
options.windowMaximized = false;
get_style_context()->remove_class("maximized");
}
}
return true;