diff --git a/rtdata/themes/RawTherapee-GTK3-20_.css b/rtdata/themes/RawTherapee-GTK3-20_.css index 7384003dc..a0d7ac0e2 100644 --- a/rtdata/themes/RawTherapee-GTK3-20_.css +++ b/rtdata/themes/RawTherapee-GTK3-20_.css @@ -133,7 +133,7 @@ frame { border-style: solid; /*border-style: none none none solid;*/ padding: 0; - margin: 0.25em 0 ; + margin: 0; background-color: rgba(0,0,0,0.); min-height: 0; min-width: 0; @@ -200,7 +200,7 @@ paned.horizontal > separator { } /* Double line separator */ paned.vertical > separator { - margin: 0.5em 0; + margin: 0.25em 0; } dialog paned.horizontal > separator { @@ -728,7 +728,7 @@ flowboxchild:selected { padding: 0; } #MyExpander.withScrollbar { - margin-right: 0.5em; + margin-right: 0.25em; } /* Tool background */ @@ -1010,7 +1010,7 @@ fontchooser scrolledwindow, #MyExpander frame, dialog frame { margin: 0; - padding: 0.19em 0.75em; + padding: 0.19em 0.5em; } #RightNotebook > stack > scrolledwindow frame > border, #BatchQueueButtonsMainContainer > frame > border, @@ -1173,16 +1173,12 @@ dialog frame > label:not(.dummy) { padding: 0 0.1666666666666666em 0.1666666666666666em; } -#EditorLeftPaned:first-child { - padding: 0 0 0 0.25em; -} - #EditorLeftPaned:last-child { padding: 0.8333333333333333em 0 0 0.8333333333333333em; } #EditorRightPaned:last-child { - padding: 0 0.3333333333333333em 0 0; + padding: 0; } #MainNotebook > header #CloseButton { @@ -1204,7 +1200,7 @@ dialog frame > label:not(.dummy) { } #RightNotebook scrolledwindow { - padding: 0.3333333333333333em; + padding: 0; } #HistoryPanel { margin-top: 0.25em; diff --git a/rtdata/themes/size.css b/rtdata/themes/size.css index 636bea4b2..98130d4df 100644 --- a/rtdata/themes/size.css +++ b/rtdata/themes/size.css @@ -69,8 +69,12 @@ notebook > header tab { padding: 0 0.333333333333333333em; } notebook > header.left tab { - margin: 0.25em 0.416666666666666666em; - padding: 0.333333333333333333em 0; + margin: 0.2em; + padding: 0.333333333333333333em; +} +notebook > header.left tabs { + margin: 0; + padding: 0; } notebook > header tab > grid > image { min-height: 2em; @@ -91,7 +95,7 @@ notebook > header.left > tabs > arrow { /*?win*/ #MainNotebook > stack { - padding: 0.416666666666666666em; + padding: 0.25em; } #MainNotebook > stack > :nth-child(2) > box:nth-child(3) { @@ -132,11 +136,11 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { padding: 0; } #ToolPanelNotebook > stack { - padding: 0.5em 0 0 0; + padding: 0; } #RightNotebook > header { - margin: 0 0.416666666666666666em 0 0; + margin: 0 0.2em 0 0; } #RightNotebook > stack { padding: 0; @@ -311,7 +315,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { } #ToolPanelNotebook > stack > scrolledwindow > viewport.frame { - padding: 0 0.25em 0 0.5em; + padding: 0 0.25em; } #MyExpander { @@ -527,8 +531,11 @@ button image:not(.dummy), margin-right: 0; } +#ProfilePanel { + margin-bottom: 0.35em; +} #ProfilePanel > grid { - margin-bottom: calc(0.416666666666666666em -2px); + margin-bottom: 0.2em; } /* Reset button */ diff --git a/rtgui/rtscalable.cc b/rtgui/rtscalable.cc index 421df6c10..7aa3c82c8 100644 --- a/rtgui/rtscalable.cc +++ b/rtgui/rtscalable.cc @@ -51,7 +51,6 @@ void RTScalable::setDPInScale (const double newDPI, const int newScale) dpi *= 2.; } } - //printf("RTScalable::setDPInScale / New scale = %d & new DPI = %.3f (%.3f asked) -> Reloading all RTScalable\n", scale, dpi, newDPI); } } @@ -80,7 +79,6 @@ void RTScalable::init(Gtk::Window *window) dpi = 0.; scale = 0; - printf("RTScalable::init / setDPInScale(scale:%d, DPI:%.3f)\n", rtengine::max((int)initialGdkScale, window->get_scale_factor()), window->get_screen()->get_resolution()); setDPInScale(window->get_screen()->get_resolution(), rtengine::max((int)initialGdkScale, window->get_scale_factor())); direction = window->get_direction(); } diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc index 1adc59420..1f79792cc 100644 --- a/rtgui/rtwindow.cc +++ b/rtgui/rtwindow.cc @@ -176,7 +176,9 @@ RTWindow::RTWindow () #endif //GTK318 fontScale = options.fontSize / 9.f; - printf("\"Non-Default\" font size(%d) * scale(%d) / fontScale(%.3f)\n", options.fontSize, (int)initialGdkScale, fontScale); + if (options.rtSettings.verbose) { + printf("\"Non-Default\" font size(%d) * scale(%d) / fontScale(%.3f)\n", options.fontSize, (int)initialGdkScale, fontScale); + } } else { Glib::RefPtr style = Gtk::StyleContext::create(); Pango::FontDescription pfd = style->get_font(Gtk::STATE_FLAG_NORMAL); @@ -202,14 +204,18 @@ RTWindow::RTWindow () fontScale = (float)pt / 9.f; if ((int)initialGdkScale > 1 || pt != 9) { css = Glib::ustring::compose ("* { font-size: %1pt}", pt * (int)initialGdkScale); - printf("\"Default\" font size(%d) * scale(%d) / fontScale(%.3f)\n", pt, (int)initialGdkScale, fontScale); + if (options.rtSettings.verbose) { + printf("\"Default\" font size(%d) * scale(%d) / fontScale(%.3f)\n", pt, (int)initialGdkScale, fontScale); + } } } else { fontScale = 1.f; } } if (!css.empty()) { - printf("CSS:\n%s\n\n", css.c_str()); + if (options.rtSettings.verbose) { + printf("CSS:\n%s\n\n", css.c_str()); + } try { cssForced = Gtk::CssProvider::create(); cssForced->load_from_data (css); @@ -539,9 +545,6 @@ bool RTWindow::on_configure_event (GdkEventConfigure* event) get_position (options.windowX, options.windowY); } - //int newScale = rtengine::max((int)initialGdkScale, get_window()->get_scale_factor()); - //double newDPI = get_window()->get_screen()->get_resolution(); - printf("RTWindow::on_configure_event / newScale:%d / newDPI: %.3f\n", RTScalable::getScale(), RTScalable::getDPI()); RTImage::setDPInScale(RTScalable::getDPI(), RTScalable::getScale()); // will update the RTImage on scale/resolution change RTSurface::setDPInScale(RTScalable::getDPI(), RTScalable::getScale()); // will update the RTSurface on scale/resolution change @@ -610,7 +613,9 @@ void RTWindow::addEditorPanel (EditorPanel* ep, const std::string &name) closeb->set_focus_on_click (false); closeb->signal_clicked().connect ( sigc::bind (sigc::mem_fun (*this, &RTWindow::remEditorPanel), ep)); - titleGrid->attach_next_to (*Gtk::manage (new RTImage ("aperture.png")), Gtk::POS_RIGHT, 1, 1); + if (!EditWindow::isMultiDisplayEnabled()) { + titleGrid->attach_next_to (*Gtk::manage (new RTImage ("aperture.png")), Gtk::POS_RIGHT, 1, 1); + } titleGrid->attach_next_to (*Gtk::manage (new Gtk::Label (Glib::path_get_basename (name))), Gtk::POS_RIGHT, 1, 1); titleGrid->attach_next_to (*closeb, Gtk::POS_RIGHT, 1, 1); titleGrid->show_all (); @@ -1158,7 +1163,7 @@ void RTWindow::createSetmEditor() el->set_angle (90); } - editorLabelGrid->attach_next_to (*Gtk::manage (new RTImage ("rawtherapee-logo-24.png")), pos, 1, 1); + editorLabelGrid->attach_next_to (*Gtk::manage (new RTImage ("aperture.png")), pos, 1, 1); editorLabelGrid->attach_next_to (*el, pos, 1, 1); editorLabelGrid->set_tooltip_markup (M ("MAIN_FRAME_EDITOR_TOOLTIP"));