From 20118c401928cb0fc73d9b9cdd154938c627d7c9 Mon Sep 17 00:00:00 2001 From: Hombre Date: Sun, 2 Sep 2018 10:47:44 +0200 Subject: [PATCH 1/7] Partially hidden toolbars can now be scrolled with the mouse wheel ...thanks to the new MyScrolledToolbar class (guiutils.h/cc). This is valid for the FileBrowser tab (first and second line can be scrolled individually) and the top and bottom bar of the Editor(s) tab. see #4035 --- rtgui/editorpanel.cc | 9 ++++++-- rtgui/filecatalog.cc | 39 ++++++++++++++++++++------------ rtgui/filecatalog.h | 1 + rtgui/guiutils.cc | 53 +++++++++++++++++++++++++++++++++++++++++++- rtgui/guiutils.h | 12 ++++++++++ 5 files changed, 97 insertions(+), 17 deletions(-) diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc index c99ed2dbd..ff57ecace 100644 --- a/rtgui/editorpanel.cc +++ b/rtgui/editorpanel.cc @@ -630,7 +630,9 @@ EditorPanel::EditorPanel (FilePanel* filePanel) beforeAfterBox->set_name ("BeforeAfterContainer"); beforeAfterBox->pack_start (*afterBox); - editbox->pack_start (*toolBarPanel, Gtk::PACK_SHRINK, 2); + MyScrolledToolbar *stb1 = Gtk::manage(new MyScrolledToolbar()); + stb1->add(*toolBarPanel); + editbox->pack_start (*stb1, Gtk::PACK_SHRINK, 2); editbox->pack_start (*beforeAfterBox); // build right side panel @@ -763,7 +765,10 @@ EditorPanel::EditorPanel (FilePanel* filePanel) iops->attach_next_to (*tbShowHideSidePanels, Gtk::POS_RIGHT, 1, 1); iops->attach_next_to (*tbRightPanel_1, Gtk::POS_RIGHT, 1, 1); - editbox->pack_start (*iops, Gtk::PACK_SHRINK, 0); + MyScrolledToolbar *stb2 = Gtk::manage(new MyScrolledToolbar()); + stb2->add(*iops); + + editbox->pack_start (*stb2, Gtk::PACK_SHRINK, 0); editbox->show_all (); // build screen diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index a0d767d79..ae332754f 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -48,6 +48,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : listener(nullptr), fslistener(nullptr), iatlistener(nullptr), + hbToolBar1STB(nullptr), hasValidCurrentEFS(false), filterPanel(nullptr), exportPanel(nullptr), @@ -127,13 +128,17 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : // if NOT a single row toolbar if (!options.FileBrowserToolbarSingleRow) { - pack_start (*hbToolBar1, Gtk::PACK_SHRINK, 0); + hbToolBar1STB = Gtk::manage(new MyScrolledToolbar()); + hbToolBar1STB->add(*hbToolBar1); + pack_start (*hbToolBar1STB, Gtk::PACK_SHRINK, 0); } // setup button bar buttonBar = Gtk::manage( new Gtk::HBox () ); buttonBar->set_name ("ToolBarPanelFileBrowser"); - pack_start (*buttonBar, Gtk::PACK_SHRINK); + MyScrolledToolbar *stb = Gtk::manage(new MyScrolledToolbar()); + stb->add(*buttonBar); + pack_start (*stb, Gtk::PACK_SHRINK); tbLeftPanel_1 = new Gtk::ToggleButton (); iLeftPanel_1_Show = new RTImage("panel-to-right.png"); @@ -692,6 +697,9 @@ void FileCatalog::enableTabMode(bool enable) } else { buttonBar->show(); hbToolBar1->show(); + if (hbToolBar1STB) { + hbToolBar1STB->show(); + } exifInfo->set_active( options.showFileNames ); } @@ -910,8 +918,8 @@ void FileCatalog::refreshHeight () newHeight = h; } - if (hbToolBar1->is_visible() && !options.FileBrowserToolbarSingleRow) { - newHeight += hbToolBar1->get_height(); + if (hbToolBar1STB && hbToolBar1STB->is_visible()) { + newHeight += hbToolBar1STB->get_height(); } if (buttonBar->is_visible()) { @@ -2039,17 +2047,20 @@ void FileCatalog::updateFBQueryTB (bool singleRow) hbToolBar1->reference(); if (singleRow) { - bool removed = removeIfThere(this, hbToolBar1, false); - - if (removed) { + if (hbToolBar1STB) { + hbToolBar1STB->remove_with_viewport(); + removeIfThere(this, hbToolBar1STB, false); buttonBar->pack_start(*hbToolBar1, Gtk::PACK_EXPAND_WIDGET, 0); + hbToolBar1STB = nullptr; } } else { - bool removed = removeIfThere(buttonBar, hbToolBar1, false); - - if (removed) { - pack_start(*hbToolBar1, Gtk::PACK_SHRINK, 0); - reorder_child(*hbToolBar1, 0); + if (!hbToolBar1STB) { + removeIfThere(buttonBar, hbToolBar1, false); + hbToolBar1STB = Gtk::manage(new MyScrolledToolbar()); + hbToolBar1STB->add(*hbToolBar1); + hbToolBar1STB->show(); + pack_start (*hbToolBar1STB, Gtk::PACK_SHRINK, 0); + reorder_child(*hbToolBar1STB, 0); } } @@ -2592,7 +2603,7 @@ bool FileCatalog::handleShortcutKey (GdkEventKey* event) void FileCatalog::showToolBar() { if (!options.FileBrowserToolbarSingleRow) { - hbToolBar1->show(); + hbToolBar1STB->show(); } buttonBar->show(); @@ -2601,7 +2612,7 @@ void FileCatalog::showToolBar() void FileCatalog::hideToolBar() { if (!options.FileBrowserToolbarSingleRow) { - hbToolBar1->hide(); + hbToolBar1STB->hide(); } buttonBar->hide(); diff --git a/rtgui/filecatalog.h b/rtgui/filecatalog.h index 66f14b6b2..af16fc8ae 100644 --- a/rtgui/filecatalog.h +++ b/rtgui/filecatalog.h @@ -73,6 +73,7 @@ private: Gtk::HBox* buttonBar; Gtk::HBox* hbToolBar1; + MyScrolledToolbar* hbToolBar1STB; Gtk::HBox* fltrRankbox; Gtk::HBox* fltrLabelbox; diff --git a/rtgui/guiutils.cc b/rtgui/guiutils.cc index 28d3f6324..f957a90a0 100644 --- a/rtgui/guiutils.cc +++ b/rtgui/guiutils.cc @@ -955,7 +955,7 @@ bool MyScrolledWindow::on_scroll_event (GdkEventScroll* event) if (value2 != value) { scroll->set_value(value2); } - } else { + } else if (event->direction == GDK_SCROLL_UP) { value2 = value - step; if (value2 < lower) { @@ -981,6 +981,57 @@ void MyScrolledWindow::get_preferred_height_for_width_vfunc (int width, int &min natural_height = minimum_height = 50; } +/* + * + * Derived class of some widgets to properly handle the scroll wheel ; + * the user has to use the Shift key to be able to change the widget's value, + * otherwise the mouse wheel will scroll the toolbar. + * + */ +MyScrolledToolbar::MyScrolledToolbar () +{ + set_policy (Gtk::POLICY_EXTERNAL, Gtk::POLICY_NEVER); + set_propagate_natural_height(true); +} + +bool MyScrolledToolbar::on_scroll_event (GdkEventScroll* event) +{ + Glib::RefPtr adjust = get_hadjustment(); + Gtk::Scrollbar *scroll = get_hscrollbar(); + + if (adjust && scroll) { + double upper = adjust->get_upper(); + double lower = adjust->get_lower(); + double value = adjust->get_value(); + double step = adjust->get_step_increment() * 2; + double value2 = 0.; + + if (event->direction == GDK_SCROLL_DOWN) { + value2 = value + step; + + if (value2 > upper) { + value2 = upper; + } + + if (value2 != value) { + scroll->set_value(value2); + } + } else if (event->direction == GDK_SCROLL_UP) { + value2 = value - step; + + if (value2 < lower) { + value2 = lower; + } + + if (value2 != value) { + scroll->set_value(value2); + } + } + } + + return true; +} + MyComboBoxText::MyComboBoxText (bool has_entry) : Gtk::ComboBoxText(has_entry) { minimumWidth = naturalWidth = 70; diff --git a/rtgui/guiutils.h b/rtgui/guiutils.h index 2861b4913..89d05bfce 100644 --- a/rtgui/guiutils.h +++ b/rtgui/guiutils.h @@ -293,6 +293,18 @@ public: MyScrolledWindow(); }; +/** + * @brief subclass of Gtk::ScrolledWindow in order to handle the large toolbars (wider than available space) + */ +class MyScrolledToolbar : public Gtk::ScrolledWindow +{ + + bool on_scroll_event (GdkEventScroll* event); + +public: + MyScrolledToolbar(); +}; + /** * @brief subclass of Gtk::ComboBox in order to handle the scrollwheel */ From 758299aa2c7c6fd5acd67124fb4e93efdb111b2e Mon Sep 17 00:00:00 2001 From: Hombre Date: Mon, 3 Sep 2018 00:18:03 +0200 Subject: [PATCH 2/7] Support of GDK_SCROLL_SMOOTH sent by some devices. See #4035. --- rtgui/guiutils.cc | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/rtgui/guiutils.cc b/rtgui/guiutils.cc index f957a90a0..27e385b23 100644 --- a/rtgui/guiutils.cc +++ b/rtgui/guiutils.cc @@ -1026,6 +1026,27 @@ bool MyScrolledToolbar::on_scroll_event (GdkEventScroll* event) if (value2 != value) { scroll->set_value(value2); } + } else if (event->direction == GDK_SCROLL_SMOOTH) { + step = 0.; + if (event->delta_x) { // if the user use a pad, it can scroll horizontally + step = event->delta_x; + } else if (event->delta_y) { + step = event->delta_y; + } + + if (step != 0.) { + value2 = value + step /* * 2 */; // we could use a multiplicator here + + if (value2 < lower) { + value2 = lower; + } else if (value2 > upper) { + value2 = upper; + } + + if (value2 != value) { + scroll->set_value(value2); + } + } } } From b226c125ce833ce41d0a8fa6fad062e695594506 Mon Sep 17 00:00:00 2001 From: Hombre Date: Mon, 3 Sep 2018 23:19:37 +0200 Subject: [PATCH 3/7] Scrollable toolbars has been named, and 'scrollableToolbar' class added see #4035 --- rtgui/editorpanel.cc | 2 ++ rtgui/filecatalog.cc | 3 +++ rtgui/guiutils.cc | 1 + 3 files changed, 6 insertions(+) diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc index ff57ecace..7f7dfd148 100644 --- a/rtgui/editorpanel.cc +++ b/rtgui/editorpanel.cc @@ -631,6 +631,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel) beforeAfterBox->pack_start (*afterBox); MyScrolledToolbar *stb1 = Gtk::manage(new MyScrolledToolbar()); + stb1->set_name("EditorToolbarTop"); stb1->add(*toolBarPanel); editbox->pack_start (*stb1, Gtk::PACK_SHRINK, 2); editbox->pack_start (*beforeAfterBox); @@ -766,6 +767,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel) iops->attach_next_to (*tbRightPanel_1, Gtk::POS_RIGHT, 1, 1); MyScrolledToolbar *stb2 = Gtk::manage(new MyScrolledToolbar()); + stb2->set_name("EditorToolbarBottom"); stb2->add(*iops); editbox->pack_start (*stb2, Gtk::PACK_SHRINK, 0); diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index ae332754f..ae471dea5 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -129,6 +129,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : // if NOT a single row toolbar if (!options.FileBrowserToolbarSingleRow) { hbToolBar1STB = Gtk::manage(new MyScrolledToolbar()); + hbToolBar1STB->set_name("FileBrowserQueryToolbar"); hbToolBar1STB->add(*hbToolBar1); pack_start (*hbToolBar1STB, Gtk::PACK_SHRINK, 0); } @@ -137,6 +138,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : buttonBar = Gtk::manage( new Gtk::HBox () ); buttonBar->set_name ("ToolBarPanelFileBrowser"); MyScrolledToolbar *stb = Gtk::manage(new MyScrolledToolbar()); + stb->set_name("FileBrowserIconToolbar"); stb->add(*buttonBar); pack_start (*stb, Gtk::PACK_SHRINK); @@ -2057,6 +2059,7 @@ void FileCatalog::updateFBQueryTB (bool singleRow) if (!hbToolBar1STB) { removeIfThere(buttonBar, hbToolBar1, false); hbToolBar1STB = Gtk::manage(new MyScrolledToolbar()); + hbToolBar1STB->set_name("FileBrowserQueryToolbar"); hbToolBar1STB->add(*hbToolBar1); hbToolBar1STB->show(); pack_start (*hbToolBar1STB, Gtk::PACK_SHRINK, 0); diff --git a/rtgui/guiutils.cc b/rtgui/guiutils.cc index 27e385b23..76484ceba 100644 --- a/rtgui/guiutils.cc +++ b/rtgui/guiutils.cc @@ -992,6 +992,7 @@ MyScrolledToolbar::MyScrolledToolbar () { set_policy (Gtk::POLICY_EXTERNAL, Gtk::POLICY_NEVER); set_propagate_natural_height(true); + get_style_context()->add_class("scrollableToolbar"); } bool MyScrolledToolbar::on_scroll_event (GdkEventScroll* event) From 98fc85b68d4fd637ae5ceeb8c88e2d70c92ce318 Mon Sep 17 00:00:00 2001 From: Hombre Date: Tue, 4 Sep 2018 23:06:17 +0200 Subject: [PATCH 4/7] Revert GDK_SCROLL_SMOOTH scrolling of Toolbars to a fixed step also remove GUI space in "FileBrowser" widget see #4035 --- rtgui/filecatalog.cc | 1 - rtgui/guiutils.cc | 34 ++++++---------------------------- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index ae471dea5..2271c05c7 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -62,7 +62,6 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : inTabMode = false; set_name ("FileBrowser"); - set_spacing (2); // construct and initialize thumbnail browsers fileBrowser = Gtk::manage( new FileBrowser() ); diff --git a/rtgui/guiutils.cc b/rtgui/guiutils.cc index 76484ceba..447c9d8af 100644 --- a/rtgui/guiutils.cc +++ b/rtgui/guiutils.cc @@ -1008,45 +1008,23 @@ bool MyScrolledToolbar::on_scroll_event (GdkEventScroll* event) double value2 = 0.; if (event->direction == GDK_SCROLL_DOWN) { - value2 = value + step; - - if (value2 > upper) { - value2 = upper; - } - + value2 = rtengine::min(value + step, upper); if (value2 != value) { scroll->set_value(value2); } } else if (event->direction == GDK_SCROLL_UP) { - value2 = value - step; - - if (value2 < lower) { - value2 = lower; - } - + value2 = rtengine::max(value - step, lower); if (value2 != value) { scroll->set_value(value2); } } else if (event->direction == GDK_SCROLL_SMOOTH) { - step = 0.; if (event->delta_x) { // if the user use a pad, it can scroll horizontally - step = event->delta_x; + value2 = rtengine::LIM(value + (event->delta_x > 0 ? 30 : -30), lower, upper); } else if (event->delta_y) { - step = event->delta_y; + value2 = rtengine::LIM(value + (event->delta_y > 0 ? 30 : -30), lower, upper); } - - if (step != 0.) { - value2 = value + step /* * 2 */; // we could use a multiplicator here - - if (value2 < lower) { - value2 = lower; - } else if (value2 > upper) { - value2 = upper; - } - - if (value2 != value) { - scroll->set_value(value2); - } + if (value2 != value) { + scroll->set_value(value2); } } } From 2a3e777b96eaa70e845f4da0e27343cd3ff19d2d Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Thu, 6 Sep 2018 00:53:23 +0200 Subject: [PATCH 5/7] Update TooWaBlue theme v2.74 Fix for Gtk3.24 and Scrolled Tootlbar. --- rtdata/themes/TooWaBlue-GTK3-20_.css | 504 ++++++++++++++------------- 1 file changed, 257 insertions(+), 247 deletions(-) diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css index d54db7f86..af0173441 100644 --- a/rtdata/themes/TooWaBlue-GTK3-20_.css +++ b/rtdata/themes/TooWaBlue-GTK3-20_.css @@ -2,7 +2,7 @@ This file is part of RawTherapee. Copyright (c) 2016-2018 TooWaBoo - Version 2.73 + Version 2.74 RawTherapee is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -99,9 +99,11 @@ window.background { background-color: @bg-light-grey; } +/* Single Window */ window > box { - padding: 0.41667em; + padding: 0.4167em; } +/**/ dialog { background-color: @bg-grey; border-radius: 0; @@ -111,7 +113,7 @@ dialog { -GtkDialog-action-area-border: 0; } dialog > box { - padding: 0.66667em; + padding: 0.6667em; } messagedialog { background-color: @bg-light-grey; @@ -119,8 +121,8 @@ messagedialog { } tooltip { background-color: @bg-tooltip; - border: 0.08334em solid @border-tooltip; - border-radius: 0.33334em; + border: 0.0834em solid @border-tooltip; + border-radius: 0.3334em; padding: 0; margin: 0; box-shadow: none; @@ -162,7 +164,7 @@ frame { #BatchQueueButtonsMainContainer frame, #MyExpander frame, dialog frame { - margin: 0.16667em 0.5em; + margin: 0.1667em 0.5em; } /* affects selection list*/ entry > window > frame, @@ -190,7 +192,7 @@ frame > border { dialog frame > border { padding: 0.5em; border-radius: 0; - border: 0.08334em solid @border-color; + border: 0.0834em solid @border-color; background-color: transparent; margin: 0 -0.5em; } @@ -211,18 +213,18 @@ filechooser > frame > border { #ToolPanelNotebook frame > label, dialog frame > label { margin: 0; - padding: 0.16667em 0.5em; + padding: 0.1667em 0.5em; } #BatchQueueButtonsMainContainer frame > border { - margin-bottom: 0.83334em; + margin-bottom: 0.8334em; } #BatchQueueButtonsMainContainer frame:nth-child(3) > border { - padding-left: 0.91667em; + padding-left: 0.9167em; } frame > label { margin: 0; - padding: 0.41667em 0 0.33334em 0.08334em; + padding: 0.4167em 0 0.3334em 0.0834em; color: @headline-frame; } frame > checkbutton label{ @@ -234,7 +236,7 @@ frame > checkbutton label{ textview.view, treeview.view { background-color: @bg-dark-grey; border-color: @view-grid-border; - padding: 0.16667em; + padding: 0.1667em; margin: 0; } textview:hover, treeview:hover { @@ -247,12 +249,12 @@ textview:selected, treeview:selected { } #RightNotebook > stack > :nth-child(1) treeview { - border: 0.08334em solid @bg-dark-grey; + border: 0.0834em solid @bg-dark-grey; border-bottom: none; } #PlacesPaned > box:nth-child(1) treeview { - padding: 0.08334em 0 0.08334em 0.416667em; + padding: 0.0834em 0 0.0834em 0.41667em; -gtk-icon-style: symbolic; } @@ -260,14 +262,14 @@ textview:selected, treeview:selected { margin-top: 0.25em; } #RightNotebook #HistoryPanel { - margin-top: 0.33334em; + margin-top: 0.3334em; } #HistoryPanel > border { margin-top: 1.75em; } #HistoryPanel > label { margin: 0 0 -1.5em 0; - padding: 0 0 0 0.08334em; + padding: 0 0 0 0.0834em; } #Snapshots > border { @@ -285,7 +287,7 @@ textview:selected, treeview:selected { min-width: 24px; } #Snapshots > box > :nth-child(1) { - margin-bottom: 0.41667em; + margin-bottom: 0.4167em; } #PlacesPaned > box:nth-child(3) > box:nth-child(2), @@ -293,12 +295,12 @@ textview:selected, treeview:selected { #HistoryPanel > border, #Snapshots > box > :nth-child(1) { background-color: @bg-dark-grey; - border: 0.08334em solid @bg-dark-grey; + border: 0.0834em solid @bg-dark-grey; } /*Corrects the space of the snapshot view to the paned separator*/ #Snapshots { - margin-top: 0.16667em; + margin-top: 0.1667em; } /**/ @@ -311,7 +313,7 @@ textview:selected, treeview:selected { background-color: @bg-dark-grey; } #Navigator box label { - padding: 0.16667em 0; + padding: 0.1667em 0; } #Navigator > label:nth-child(2) { margin-top: 0.5em; @@ -334,11 +336,11 @@ filechooser box { } filechooser > box > paned > box { - border: 0.08334em solid @bg-dark-grey; + border: 0.0834em solid @bg-dark-grey; background-color: @bg-dark-grey; } filechooser placessidebar { - padding: 0 0.08334em; + padding: 0 0.0834em; background-color: @bg-dark-grey; } @@ -352,7 +354,7 @@ filechooser list { filechooser list row { margin: 0; padding: 0; - min-height: calc(1.41667em + 8px); + min-height: calc(1.4166em + 8px); } filechooser list row label{ margin: 0; @@ -379,7 +381,7 @@ filechooser list row:selected { #HistogramPanel > :nth-child(2) { border: none; - border-left: 0.08334em solid @bg-light-grey; + border-left: 0.0834em solid @bg-light-grey; background-color: @bg-dark-grey; } @@ -390,7 +392,7 @@ filechooser list row:selected { #EditorLeftPaned #HistogramPanel > :nth-child(1) { border: none; - border-right: 0.08334em solid @bg-light-grey; + border-right: 0.0834em solid @bg-light-grey; background-color: @bg-dark-grey; } @@ -401,7 +403,7 @@ filechooser list row:selected { #HistogramArea, #HistogramRGBArea { - border: 0.08334em solid @bg-dark-grey; + border: 0.0834em solid @bg-dark-grey; background-color: @bg-dark-grey; } @@ -412,8 +414,8 @@ filechooser list row:selected { background-color: @bg-dark-grey; background-image: none; box-shadow: none; - min-height: 1.41667em; - min-width: calc(1.33334em + 6px); + min-height: 1.4166em; + min-width: calc(1.3333em + 6px); border-radius: 0; } @@ -434,7 +436,7 @@ separator { background-color: transparent; } grid separator.horizontal, box separator.horizontal { - margin: 0.16667em 0; + margin: 0.1667em 0; padding: 0; } grid separator.vertical, box separator.vertical { @@ -455,11 +457,10 @@ popover separator:not(:only-child) { paned.horizontal > separator { background-color: transparent; background-image: none; - min-width: 0.41667em; - border-left: 0.25em solid @bg-light-grey; - border-right: 0.25em solid @bg-light-grey; + min-width: 0.4166em; + border: none; margin: 0 -0.25em; - padding: 0; + padding: 0 0.25em; } paned.vertical > separator { @@ -474,15 +475,13 @@ paned.vertical > separator { /*Filmstrip*/ #EditorRightPaned > paned.horizontal > paned.vertical > separator { margin-bottom: 0; -} -#EditorRightPaned > paned.horizontal:nth-child(1) > paned.vertical:nth-child(1) > separator { - margin-bottom: -0.5em; + min-height: 0.4167em; } dialog paned.horizontal > separator { background-color: @bg-grey; border-color: @bg-grey; - min-width: 0.33334em; + min-width: 0.3333em; } menu separator { @@ -500,13 +499,13 @@ menu separator { #IopsPanel separator, #FileBrowser separator { background-color: shade(@bg-light-grey,.75); - margin-top: 0.16667em; - margin-bottom: 0.16667em; + margin-top: 0.1667em; + margin-bottom: 0.1667em; } #MyExpander separator { background-color: @view-grid-border; - margin: 0.33334em 0; + margin: 0.3334em 0; } #MyFileChooserButton separator { background-color: transparent; @@ -519,24 +518,24 @@ menu separator { /*** PartialPaste ******************************************************************************/ #PartialPaste { - border-bottom: 0.08334em solid @border-color; - border-top: 0.08334em solid @border-color; + border-bottom: 0.0834em solid @border-color; + border-top: 0.0834em solid @border-color; padding-top: 0.5em; padding-bottom: 0.5em; } #PartialPaste separator.vertical { - margin: 0 0.33334em; + margin: 0 0.3334em; padding: 0; } #PartialPaste separator { /* Struggles with #PartialPasteHeaderSep */ background-color: @border-color; - margin: 0.16667em 0.5em 0.16667em 1.16667em; + margin: 0.1667em 0.5em 0.1667em 1.1667em; } #PartialPasteHeaderSep.horizontal { background-color: rgb(192,192,192); - margin: 0.16667em 0.5em; + margin: 0.1667em 0.5em; } #PartialPasteHeader label { @@ -571,10 +570,10 @@ scrollbar:not(.overlay-indicator) { background-color: rgba(0,0,0,.30); } scrollbar:not(.overlay-indicator).horizontal { - border-width: 0 0.08334em 0.08334em 0.08334em; + border-width: 0 0.0834em 0.0834em 0.0834em; } scrollbar:not(.overlay-indicator).vertical { - border-width: 0.08334em 0.08334em 0.08334em 0; + border-width: 0.0834em 0.0834em 0.0834em 0; } scrollbar:not(.overlay-indicator) slider { background-color: shade(@text-color, .9); @@ -595,9 +594,9 @@ scrollbar.horizontal.hovering.fine-tune slider { scrollbar.horizontal.overlay-indicator:not(.hovering) slider { min-width: 2em; min-height: 0.25em; - border-width: 0.08334em; + border-width: 0.0834em; border-radius: 0.25em; - margin: 0 0.16667em; + margin: 0 0.1667em; } scrollbar:not(.overlay-indicator).vertical slider, @@ -615,9 +614,9 @@ scrollbar.vertical.hovering.fine-tune slider { scrollbar.vertical.overlay-indicator:not(.hovering) slider { min-width: 0.25em; min-height: 2em; - border-width: 0.08334em; + border-width: 0.0834em; border-radius: 0.5em; - margin: 0.16667em 0; + margin: 0.1667em 0; } scrollbar:not(.overlay-indicator) slider:hover, @@ -635,7 +634,7 @@ scrollbar:not(.overlay-indicator):hover { /*** Scale**************************************************************************************/ scale { padding: 0; - min-height: 1.83334em; + min-height: 1.8333em; margin: 0 0.25em; } @@ -643,10 +642,10 @@ scale slider { /* Slider size is min-width x min-height; margin have to be half of those values, but negative */ min-width: 1em; min-height: 1em; - margin: calc(-0.33334em - 1px); - border-radius: 0.83334em; + margin: calc(-0.166em - 4px); + border-radius: 0.8334em; background-image: linear-gradient(to bottom, shade (@accent-color4,1.15), shade (@accent-color4,.85)); - border: 0.08334em solid @bg-button-border; + border: 0.0834em solid @bg-button-border; box-shadow: none; } scale slider:hover { @@ -656,14 +655,14 @@ scale slider:hover { scale trough { margin: 0.5em; /* has to be half of "scale slider / min-width min-height*/ background-color: @bg-scale-entry; - border: 0.08334em solid @bg-button-border; - box-shadow: inset 0 0.08334em rgba(255, 255, 255, 0.11), 0 0.08334em rgba(242, 242, 242, 0.11); + border: 0.0834em solid @bg-button-border; + box-shadow: inset 0 0.0834em rgba(255, 255, 255, 0.11), 0 0.0834em rgba(242, 242, 242, 0.11); border-radius: 0.5em; } scale:not(:disabled) trough highlight { background-color: @accent-color2; - border: 0.08334em solid @bg-dark-grey; - box-shadow: inset 0 0.08334em shade(@accent-color2, 1.25); + border: 0.0834em solid @bg-dark-grey; + box-shadow: inset 0 0.1667em shade(@accent-color2, 1.25); border-radius: 0.5em; } @@ -712,14 +711,14 @@ progressbar.vertical trough progress { } progressbar.horizontal trough { - min-height: 0.41667em; + min-height: 0.4166em; background-color: transparent; border: none; border-radius: 0.5em; - margin-top: 0.58334em; + margin-top: 0.5834em; } progressbar.horizontal trough progress { - min-height: 0.41667em; + min-height: 0.4166em; margin: -1px 0; background-color: @accent-color2; border: none; @@ -729,7 +728,7 @@ progressbar.horizontal trough progress { #IopsPanel progressbar.horizontal trough { min-height: 0.5em; background-color: @bg-scale-entry; - border: 0.08334em solid @bg-button-border; + border: 0.0834em solid @bg-button-border; margin-top: 0.25em; } #IopsPanel progressbar.horizontal trough progress { @@ -758,22 +757,22 @@ notebook stack { } notebook header { background-color: @bg-dark-grey; - padding: 0 0.41667em; + padding: 0 0.4167em; } notebook header.left { - padding: 0.41667em 0; + padding: 0.4167em 0; } notebook tabs { background-color: transparent; } notebook header tab { background-color: transparent; - margin: 0.41667em 0.25em; - padding: 0 0.33334em; + margin: 0.4167em 0.25em; + padding: 0 0.3334em; } notebook header.left tab { - margin: 0.25em 0.41667em; - padding: 0.33334em 0; + margin: 0.25em 0.4167em; + padding: 0.3334em 0; } notebook header tab > grid > image { min-height: 2.5em; @@ -787,7 +786,7 @@ notebook header.left tab > grid > image { padding: 0.25em 0 0; } notebook header tab label { - margin: 0.08334em; + margin: 0.0834em; } notebook header tab:hover label { color: @headline-hl; @@ -803,11 +802,11 @@ notebook > header > tabs > arrow { border-radius: 0.2em; min-width: 0; min-height: 0; - padding: 0 0.16667em; + padding: 0 0.1667em; margin: 0.5em 0; } notebook > header.left > tabs > arrow { - padding: 0.16667em 0; + padding: 0.1667em 0; margin: 0 0.5em; } notebook > header > tabs > arrow:hover { @@ -826,11 +825,11 @@ dialog notebook stack { /*?win*/ #MainNotebook > stack { - padding: 0.41667em; + padding: 0.4167em; } #MainNotebook > stack > :nth-child(2) > box:nth-child(3) { - margin-top: 0.41667em; + margin-top: 0.4167em; } @@ -838,58 +837,58 @@ dialog notebook stack { dialog.csd #PrefNotebook > header, dialog.csd #AboutNotebook > header, window.csd:not(.fullscreen) #MainNotebook > header.top { - border-top: 0.083334em solid rgba(200,200,200,.18); + border-top: 0.08334em solid rgba(200,200,200,.18); } /**/ #ToolPanelNotebook > header tabs { - margin-bottom: 0.33334em; + margin-bottom: 0.3334em; } #ToolPanelNotebook > header tab { margin-left: 0; margin-right: 0; - padding: 0 0.33334em; + padding: 0 0.3334em; } #ToolPanelNotebook > header tab + tab { margin-left: 0.25em; } #ToolPanelNotebook > header tab #TextOrIcon image{ - min-height: 2.33334em; + min-height: 2.3333em; min-width: calc(2em + 4px); padding: 2px 0; margin: 0; } #RightNotebook > header { - margin: 0 0.41667em 0 0; + margin: 0 0.4167em 0 0; } #RightNotebook > stack { background-color: @bg-grey; padding: 0; } #RightNotebook header tab label { - padding-left: 0.16667em; - padding-right: 0.16667em; + padding-left: 0.1667em; + padding-right: 0.1667em; } #RightNotebook > stack > :nth-child(1) > * > box, #RightNotebook > stack > :nth-child(4) > * > box { padding: 0.5em; - border: 0.08334em solid @bg-entry-border; + border: 0.0834em solid @bg-entry-border; } #PrefNotebook header { - margin: -0.66667em -0.66667em 0.33334em; + margin: -0.6667em -0.6667em 0.3334em; } #PrefNotebook header tab label { - padding-top: 0.16667em; - padding-bottom: 0.16667em; + padding-top: 0.1667em; + padding-bottom: 0.1667em; } #AboutNotebook header { - margin: -0.66667em -0.66667em 0.66667em; + margin: -0.6667em -0.6667em 0.6667em; } #AboutNotebook stack text { @@ -901,15 +900,15 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { #MetaPanelNotebook header { background-color: @bg-grey; - padding: 0.33334em; + padding: 0.3334em; margin: 0 0.5em 0; } #MetaPanelNotebook > header > tabs { background-color: @bg-dark-grey; - padding-left: 0.33334em; + padding-left: 0.3334em; } #MetaPanelNotebook > header tab label{ - margin: 0.08334em; + margin: 0.0834em; } #MetaPanelNotebook > stack > box { @@ -917,11 +916,11 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { background-color: @bg-grey; border-radius: 0; border-top-style: none; - padding: 0 0.33334em 0.25em; + padding: 0 0.3334em 0.25em; margin: 0 0.5em -0.5em; } #MetaPanelNotebook > stack > box:nth-child(1) > scrolledwindow { - margin: 0 0 0.33334em; + margin: 0 0 0.3334em; padding: 0; } @@ -931,23 +930,23 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { #MetaPanelNotebook separator { background-color: @border-color; - margin: 0.16667em 0; + margin: 0.1667em 0; } #MetaPanelNotebook entry, #MetaPanelNotebook button, #MetaPanelNotebook combobox button { margin-top: 0; margin-bottom: 0; - min-height: 1.66667em; - min-width: 0.83334em; + min-height: 1.6666em; + min-width: 0.8333em; } #MetaPanelNotebook entry { - padding: 0 0.33334em; + padding: 0 0.3334em; background-color: @bg-dark-grey; margin: 0; border-radius: 0; } #MetaPanelNotebook > stack > box:nth-child(1) > :nth-child(1) { - border: 0.08334em solid @bg-dark-grey; + border: 0.0834em solid @bg-dark-grey; } #MetaPanelNotebook > stack > box:nth-child(2) > scrolledwindow scrolledwindow { background-color: @bg-dark-grey; @@ -955,13 +954,13 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { margin: 0; } #MetaPanelNotebook > stack > box:nth-child(2) .view { - border: 0.08334em solid @bg-dark-grey; - padding: 0.16667em; + border: 0.0834em solid @bg-dark-grey; + padding: 0.1667em; margin: 0; } #MetaPanelNotebook textview.view { background-color: @bg-dark-grey; - padding: 0.08334em 0.33334em; + padding: 0.0834em 0.3334em; margin: 0; } #MetaPanelNotebook text { @@ -977,17 +976,17 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { } #MetaPanelNotebook combobox + button, #MetaPanelNotebook combobox + button + button { - margin-left: 0.16667em; - min-width: 1.66667em; + margin-left: 0.1667em; + min-width: 1.6666em; } #MetaPanelNotebook > stack > box > grid > button { - margin-top: 0.08334em; - margin-bottom: 0.08334em; - min-height: 2.16667em; + margin-top: 0.0834em; + margin-bottom: 0.0834em; + min-height: 2.1666em; } #MetaPanelNotebook label { - padding: 0.08334em 0; + padding: 0.0834em 0; } /*** end ***************************************************************************************/ @@ -995,7 +994,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { /*** File Browser ******************************************************************************/ #FileCatalog { background-color: @bg-image; - border: 0.08334em solid @bg-dark-grey; + border: 0.0834em solid @bg-dark-grey; } #FileCatalog:selected { background-color: @accent-color3; @@ -1009,19 +1008,19 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { } #ToolBarPanelFileBrowser { - margin: -2px -1px; + margin: 0.4167em -1px; min-height: 0; min-width: 0; - padding: 0.41667em 0; + padding: 0; } #ToolBarPanelFileBrowser > box > button, #ToolBarPanelFileBrowser > button { - margin: 0 0.08334em; + margin: 0 0.0834em; } /* Filter */ #ToolBarPanelFileBrowser .smallbuttonbox { - min-height: 1.16667em; + min-height: 1.0834em; padding: 0; margin: 0; } @@ -1030,7 +1029,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { } #ToolBarPanelFileBrowser .smallbuttonbox button.smallbutton { min-height: 0; - min-width: 1.16667em; + min-width: 1.0834em; padding: 0; margin: 0 2px; border: none; @@ -1043,29 +1042,30 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { background-color: @bg-dark-grey; } #ToolBarPanelFileBrowser .smallbuttonbox button.smallbutton image{ - -gtk-icon-transform: scale(calc(13/16)); + -gtk-icon-transform: scale(calc(14/16)); margin: -2px } +/**/ #ToolBarPanelFileBrowser entry + button.flat, #FileBrowser entry + button.flat { - min-height: 1.66667em; - min-width: 1.66667em; - margin: 0 0 0 -1.66667em; + min-height: 1.6666em; + min-width: 1.6666em; + margin: 0 0 0 -1.6667em; border-radius: 0 0.2em 0.2em 0; - border: 0.08334em solid transparent; + border: 0.0834em solid transparent; padding: 0; } #ToolBarPanelFileBrowser entry, #FileBrowser entry { - min-height: 1.66667em; + min-height: 1.6666em; min-width: 12em; margin: 0 -2px 0 0; - padding: 0 2em 0 0.33334em; + padding: 0 2em 0 0.3334em; } #ToolBarPanelFileBrowser label, #FileBrowser label { - margin: 0 0.33334em 0 0.5em; + margin: 0 0.3334em 0 0.5em; } /*** end ***************************************************************************************/ @@ -1076,21 +1076,21 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { #BeforeAfterContainer { background-color: @bg-grey; - border: 0.08334em solid @bg-dark-grey; + border: 0.0834em solid @bg-dark-grey; border-radius: 0; padding: 0; - margin: 0.41667em 0; + margin: -2px 0 0.4167em; } #BeforeAfterContainer > box:nth-child(2) > box:nth-child(2), #BeforeAfterContainer > box:nth-child(1) > box:nth-child(2){ - border-top: 0.08334em solid @bg-dark-grey; + border-top: 0.0834em solid @bg-dark-grey; } #BeforeAfterContainer > box:nth-child(2){ - border-left: 0.08334em solid @bg-dark-grey; + border-left: 0.0834em solid @bg-dark-grey; } #BeforeAfterContainer label { - min-height: 2.66667em; + min-height: 2.6666em; padding: 0 0.5em; } /* Small Lock Button */ @@ -1108,15 +1108,25 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { } /**/ -#EditorTopPanel { - margin: -2px -2px; +#EditorToolbarTop { + margin: -2px -2px 0.4167em; padding: 0; min-height: 0; } +/* Single Window */ +window > box > #EditorRightPaned > paned > paned > box { + margin-top: -2px; + padding: 0; +} +window > box > #EditorRightPaned > paned > paned > box > #EditorToolbarTop { + margin-top: 0; +} +/**/ + #EditorTopPanel button { - margin: 0 0.08334em; - min-height: 2.16667em; - min-width: 2.16667em; + margin: 0 0.0834em; + min-height: 2.1666em; + min-width: 2.1666em; } /* Removes margin from the last button. Otherwise the filmstrip will cut of the right border. */ #EditorTopPanel :last-child > button:last-child { @@ -1124,7 +1134,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { } #EditorTopPanel button.narrowbutton { - min-width: 1.05em; + min-width: 1em; padding: 0; } @@ -1137,8 +1147,8 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { padding: 0 2px 0 3px; } #EditorZoomPanel button { - margin-left: 0.08334em; - margin-right: 0.08334em; + margin-left: 0.0834em; + margin-right: 0.0834em; } /*** end ***************************************************************************************/ @@ -1153,14 +1163,14 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { } /**/ #MyExpander .drawingarea:not(.slider) { - border: 0.08334em solid @bg-light-grey; + border: 0.0834em solid @bg-light-grey; background-color: @bg-dark-grey; } #MyExpander .slider, #MyExpander #CurveSHCSelector { background-image: linear-gradient(to bottom, shade (@accent-color4,1.15), shade (@accent-color4,.85)); background-color: @accent-color4; - border: 0.08334em solid rgb(15,15,15); + border: 0.0834em solid rgb(15,15,15); } #MyExpander .drawingarea:disabled { background-color: shade(@bg-grey,.85); @@ -1168,7 +1178,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { background-image: none; } #ThresholdAdjuster { - margin: 0.08334em 0 0.16667em 0; + margin: 0.0834em 0 0.1667em 0; } #ToolPanelNotebook scrolledwindow viewport.frame { @@ -1190,7 +1200,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { /* Sub-tool (MyExpander) */ #ExpanderBox2 > box, #ExpanderBox2 > grid { background-color: transparent; - border: 0.08334em solid @border-color; + border: 0.0834em solid @border-color; border-radius: 0; margin: 0; padding: 0.5em; @@ -1204,7 +1214,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { #MyExpanderTitle label { color: @headline-big; padding: 0; - margin: 0.08334em 0.25em 0 0.5em; + margin: 0.0834em 0.25em 0 0.5em; } #MyExpanderTitle:hover label { @@ -1219,13 +1229,13 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { border: none; padding: 0; margin: 0; - box-shadow: 0 0.25em 0.75em 0.08334em rgba(0, 0, 0, 0.50), 0 0 0 0.08334em @bg-dark-grey; + box-shadow: 0 0.25em 0.75em 0.0834em rgba(0, 0, 0, 0.50), 0 0 0 0.0834em @bg-dark-grey; } menu { background-color: @bg-dark-grey; - border: 0.08334em solid @accent-color; - padding: 0.08334em; + border: 0.0834em solid @accent-color; + padding: 0.0834em; margin: 0; } menu > .top, @@ -1239,8 +1249,8 @@ menu > .bottom:hover { } menuitem { - padding: 0 0.33334em; - margin: 0.08334em; + padding: 0 0.3334em; + margin: 0.0834em; min-height: 2em; } menuitem:hover { @@ -1254,7 +1264,7 @@ menuitem:hover > * { menu image { min-height: 2em; padding: 0; - margin: 0 0.33334em 0 0; + margin: 0 0.3334em 0 0; } /*** Selection popup list (used in filechooser) ***/ @@ -1263,11 +1273,11 @@ entry > window > frame { } entry > window > frame > border { background-color: @bg-dark-grey; - padding: 0.08334em; - border: 0.08334em solid @accent-color; + padding: 0.0834em; + border: 0.0834em solid @accent-color; } entry > window > frame > border { - margin: 0.08334em; + margin: 0.0834em; } /* end */ @@ -1277,7 +1287,7 @@ entry > window > frame > border { popover.background { background-color: @bg-dark-grey; - border: 0.08334em solid @accent-color; + border: 0.0834em solid @accent-color; border-radius: 0; padding: 0; margin: 0; @@ -1289,7 +1299,7 @@ popover.background > box { } popover.background modelbutton { min-height: 2em; - padding: 0 0.41667em; + padding: 0 0.4167em; margin: 0; border-radius: 0; } @@ -1306,24 +1316,24 @@ popover.background modelbutton:hover { /*** Switch ***********************************************************************************/ switch { - min-height: 2.16667em; + min-height: 2.1666em; min-width: 11em; margin: 0; padding: 0; border-radius: 0.2em; background-image: none; - box-shadow: inset 0.08334em 0.08334em rgba(0, 0, 0, 0.08), 0 0.08334em rgba(242, 242, 242, 0.1); - border: 0.08334em solid @bg-entry-border; + box-shadow: inset 0.0834em 0.0834em rgba(0, 0, 0, 0.08), 0 0.0834em rgba(242, 242, 242, 0.1); + border: 0.0834em solid @bg-entry-border; background-color: @bg-scale-entry; margin-bottom: 0.5em; } switch slider { - border: 0.08334em solid @bg-entry-border; + border: 0.0834em solid @bg-entry-border; background-color: shade (@bg-light-grey, .85); background-image: linear-gradient(to bottom, rgba(125,125,125,.4), rgba(60,60,60,.4)); - border: 0.08334em solid @bg-entry-border; - box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.1); + border: 0.0834em solid @bg-entry-border; + box-shadow: inset 0 0.0834em rgba(242, 242, 242, 0.1); border-radius: 0.2em 0 0 0.2em; } switch:checked slider{ @@ -1351,14 +1361,14 @@ switch:disabled:not(:checked) { /*** Buttons ***********************************************************************************/ button { - min-height: 2.16667em; - min-width: 2.16667em; + min-height: 2.1666em; + min-width: 2.1666em; margin: 0; padding: 0; /* x */ border-radius: 0.2em; - border: 0.08334em solid @bg-button-border; + border: 0.0834em solid @bg-button-border; background-color: transparent; - box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.1); + box-shadow: inset 0 0.0834em rgba(242, 242, 242, 0.1); background-image: linear-gradient(to bottom, rgba(100,100,100,.3), rgba(30,30,30,.3)); } button.flat { @@ -1369,11 +1379,11 @@ button.text-button label { } #PrefNotebook > stack > :nth-child(5) combobox { - /* margin: 0.16667em 0; */ + /* margin: 0.1667em 0; */ margin: 2px 0; } #PrefNotebook > stack > :nth-child(2) #MyFileChooserButton { - /* margin: 0.25em 0.33334em; */ + /* margin: 0.25em 0.3334em; */ margin: 3px 5px; } @@ -1385,7 +1395,7 @@ filechooser button image, #MainNotebook > header > grid > button, button.flat { - border: 0.08334em solid transparent; + border: 0.0834em solid transparent; box-shadow: none; background-image: none; background-color: transparent; @@ -1397,18 +1407,18 @@ button.flat { dialog scale + button.flat, #MainNotebook > stack > :nth-child(2) > box:nth-child(1) scale + button.flat, entry + button.flat { - min-height: 1.16667em; + min-height: 1.1666em; min-width: 1.5em; - margin: 0.08334em 0 0.08334em 0.16667em; - padding: 0 0 0 0.16667em; + margin: 0.0834em 0 0.0834em 0.1667em; + padding: 0 0 0 0.1667em; } dialog entry + button:last-child.flat { - min-height: 1.66667em; + min-height: 1.6666em; } #MyExpander scale + button:last-child.flat, #MyExpander spinbutton + button:last-child.flat { - margin: 0 0 0 0.16667em; + margin: 0 0 0 0.1667em; } #MyExpander image + button:last-child.flat { margin: 0 0 0 0.25em; @@ -1420,7 +1430,7 @@ dialog entry + button:last-child.flat { #MyExpander button.flat:first-child { min-height: 2em; min-width: 2em; - margin: 0.16667em 0.16667em 0 0; + margin: 0.1667em 0.1667em 0 0; padding: 0; } #MyExpander button.flat + button.flat image, @@ -1435,7 +1445,7 @@ dialog entry + button:last-child.flat { button.flat:hover, button:hover { border-color: @bg-button-border; - box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.1); + box-shadow: inset 0 0.0834em rgba(242, 242, 242, 0.1); background-image: linear-gradient(to bottom, rgba(100,100,100,.3), rgba(30,30,30,.3)); background-color: @bg-button-hover; } @@ -1447,7 +1457,7 @@ button.flat:checked, button:active, button:checked { border-color: @bg-button-border; - box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.08); + box-shadow: inset 0 0.0834em rgba(242, 242, 242, 0.08); background-image: linear-gradient(to bottom, rgba(100,100,100,.3), rgba(30,30,30,.3)); background-color: @bg-button-active; } @@ -1455,22 +1465,22 @@ button:checked { /* Add space between connected buttons */ button.Right, button.MiddleH { - margin-left: 0.16667em; - border: 0.08334em solid @bg-button-border; + margin-left: 0.1667em; + border: 0.0834em solid @bg-button-border; } /**/ /* Applies special styles in main notebook */ #ProfilePanel { margin-bottom: -2px; - padding-bottom: 0.41667em; + padding-bottom: 0.4167em; } #ProfilePanel > label { - margin-bottom: 0.08334em; + margin-bottom: 0.0834em; } #ProfilePanel combobox { - margin-left: 0.16667em; - margin-right: 0.16667em; + margin-left: 0.1667em; + margin-right: 0.1667em; } #ProfilePanel button.Left { margin-left: -2px; @@ -1490,13 +1500,13 @@ button.MiddleH { dialog button, #MyExpander button, #BatchQueueButtonsMainContainer button { - min-height: 1.66667em; + min-height: 1.6666em; min-width: 0; padding: 0 0.375em; - margin: 0.08334em 0; + margin: 0.0834em 0; } #MyExpander #MyFileChooserButton + button.image-button{ - min-width: 1.66667em; + min-width: 1.6666em; padding: 0; } @@ -1510,10 +1520,10 @@ dialog button.combo, margin-right: 0.25em; } combobox button cellview { - padding: 0 0 0 0.16667em; + padding: 0 0 0 0.1667em; } combobox arrow { - padding: 0 0.16667em 0 0; + padding: 0 0.1667em 0 0; margin: 0; } #MetaPanelNotebook combobox arrow { @@ -1537,17 +1547,17 @@ combobox arrow { #MyExpander combobox + combobox, #MyExpander button + label, #MyExpander combobox + label { - margin-left: 0.16667em; + margin-left: 0.1667em; } #MyExpander label + * > button:not(.flat).Left, #MyExpander label + combobox:not(:first-child):not(:only-child), #MyExpander label + button:not(.flat):not(spinbutton) { - margin-left: 0.33334em; + margin-left: 0.3334em; } buttonbox:not(.dialog-action-area) button{ - margin: 0.08334em 0 0.33334em 0.16667em; + margin: 0.0834em 0 0.3334em 0.1667em; } #PrefNotebook buttonbox:not(.dialog-action-area) { margin-right: -5px; @@ -1566,13 +1576,13 @@ buttonbox:not(.dialog-action-area) button{ padding-right: 0; border-top-left-radius: 0; border-bottom-left-radius: 0; - min-width: 1.33334em; + min-width: 1.3333em; } #IopsPanel .image-combo button.Left, #MyExpander .image-combo button.Left { border-top-right-radius: 0; border-bottom-right-radius: 0; - min-width: 2.16667em; + min-width: 2.1666em; } /**/ @@ -1585,7 +1595,7 @@ buttonbox:not(.dialog-action-area) button{ min-height: 2em; min-width: 2em; padding: 0; - margin: 0 0 0.33334em; + margin: 0 0 0.3334em; } #MyExpander button:not(.image-button).independent:first-child:not(.flat):only-child image { -gtk-icon-transform: scale(calc(20/24)); @@ -1599,18 +1609,18 @@ buttonbox:not(.dialog-action-area) button{ /**/ button.color { - min-height: 1.16667em; + min-height: 1.1666em; padding: 0.25em; } /* Save, Cancel, OK ... buttons */ .dialog-action-area button { - min-height: 2.16667em; - margin-top: 0.33334em; + min-height: 2.1666em; + margin-top: 0.3334em; } messagedialog .dialog-action-area button { - margin: 0 0.66667em 0.66667em 0.66667em; - min-height: 1.83334em; + margin: 0 0.6667em 0.6667em 0.6667em; + min-height: 1.8333em; } messagedialog .dialog-action-area button:not(:only-child):nth-child(1) { margin-right: 0.25em; @@ -1627,8 +1637,8 @@ window .view button { background-image: none; box-shadow: none; min-height: 2em; - min-width: 1.33334em; - padding: 0 0.33334em; + min-width: 1.3333em; + padding: 0 0.3334em; margin: 0; } dialog .view button.text-button label, @@ -1637,10 +1647,10 @@ window .view button.text-button label { } window .view button { border: none; - border-bottom: 0.08334em solid @border-color; + border-bottom: 0.0834em solid @border-color; } dialog .view button { - border: 0.08334em solid @border-color; + border: 0.0834em solid @border-color; } .view button:checked, @@ -1686,7 +1696,7 @@ window .view header button, } .path-bar button label { margin: 0; - padding: 0 0.33334em; + padding: 0 0.3334em; } /**/ @@ -1694,12 +1704,12 @@ window .view header button, popover button.text-button { background-color: @bg-dark-grey; background-image: none; - border: 0.08334em solid @border-color; + border: 0.0834em solid @border-color; box-shadow: none; background-image: none; - margin: 0.083334em 0; - min-height: 1.66667em; - padding: 0 0.66667em; + margin: 0.08334em 0; + min-height: 1.6666em; + padding: 0 0.6667em; } popover button.text-button label { padding: 0; @@ -1723,10 +1733,10 @@ popover button.text-button:active { /* Titlebar & Notebook buttons */ #MainNotebook > header.top > grid > button { - margin: 0 0 0 0.41667em; + margin: 0 0 0 0.4167em; } #MainNotebook > header.left > grid > button { - margin: 0.41667em 0 0; + margin: 0.4167em 0 0; } headerbar button.titlebutton image { @@ -1734,9 +1744,9 @@ headerbar button.titlebutton image { margin: 0; } headerbar button.titlebutton { - margin: 0 0 0 0.33334em; + margin: 0 0 0 0.3334em; background-image: none; - border: 0.08334em solid transparent; + border: 0.0834em solid transparent; background-color: transparent; box-shadow: none; min-width: 1.55em; @@ -1751,7 +1761,7 @@ messagedialog headerbar button.titlebutton { #MainNotebook tab #CloseButton { padding: 0; - margin: 0.33334em -2px 0.5em 0.25em; + margin: 0.3334em -2px 0.5em 0.25em; min-width: 1.5em; min-height: 1.5em; } @@ -1759,14 +1769,14 @@ messagedialog headerbar button.titlebutton { #MainNotebook tab #CloseButton:hover, headerbar button.titlebutton:hover{ border-color: rgba(0,0,0,.8); - box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.11); + box-shadow: inset 0 0.0834em rgba(242, 242, 242, 0.11); background-image: linear-gradient(to bottom, rgba(100,100,100,.3), rgba(30,30,30,.3)); background-color: rgba(128, 128, 128,.20); } #MainNotebook > header > grid > button:active, headerbar button.titlebutton:active{ border-color: rgba(0,0,0,.8); - box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.15); + box-shadow: inset 0 0.0834em rgba(242, 242, 242, 0.15); background-image: linear-gradient(to bottom, rgba(100,100,100,.3), rgba(30,30,30,.3)); background-color: rgba(128, 128, 128,.40); } @@ -1774,13 +1784,13 @@ headerbar button.titlebutton:active{ headerbar button.titlebutton.close:hover{ border-color: rgba(0,0,0,.8); background-image: linear-gradient(to bottom, rgb(180,0,0), rgb(160,0,0) 40%, rgb(130,0,0)); - box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.32); + box-shadow: inset 0 0.0834em rgba(242, 242, 242, 0.32); } #MainNotebook tab #CloseButton:active, headerbar button.titlebutton.close:active{ border-color: rgba(0,0,0,.8); background-image: linear-gradient(to bottom, rgb(215,0,0), rgb(185,0,0) 40%, rgb(150,0,0)); - box-shadow: inset 0 0.08334em rgba(242, 242, 242, 0.4); + box-shadow: inset 0 0.0834em rgba(242, 242, 242, 0.4); } /**/ @@ -1796,21 +1806,21 @@ radiobutton { } #PrefNotebook checkbox, #PrefNotebook checkbutton { - min-height: 1.6667em; + min-height: 1.6666em; } check, radio { - border: calc(0.083334em + 0.18px) solid @text-color; + border: calc(0.08334em + 0.18px) solid shade(@text-color, 0.95); background-image: none; background-color: transparent; margin: 0; padding: 0; - min-height: 1.16667em; - min-width: 1.16667em; + min-height: 1.1666em; + min-width: 1.1666em; box-shadow: none; background-repeat: no-repeat; - color: @text-color; + color: shade(@text-color, 0.95); } radiobutton label, checkbutton label { @@ -1818,11 +1828,11 @@ checkbutton label { padding: 0; } check { - border-radius: 0.16667em; + border-radius: 0.1667em; } radio{ - border-radius: 1.16667em; + border-radius: 1.1667em; } check:disabled, radio:disabled { @@ -1835,7 +1845,7 @@ frame > checkbutton check{ #PartialPaste checkbutton:not(#PartialPasteHeader) { min-height: 1.4em; - margin-left: 1.16667em; + margin-left: 1.1667em; } #PartialPasteHeader { min-height: 1.4em; @@ -1843,7 +1853,7 @@ frame > checkbutton check{ } #MyExpander button + checkbutton:last-child { - margin-left: 0.33334em; + margin-left: 0.3334em; } /*** end ***************************************************************************************/ @@ -1851,44 +1861,44 @@ frame > checkbutton check{ /*** Entry & Spinbutton ************************************************************************/ #MyExpander entry, entry { - margin: 0.08334em 0; - padding: 0 0.33334em; - min-height: 1.66667em; + margin: 0.0834em 0; + padding: 0 0.3334em; + min-height: 1.6666em; min-width: 0; border-radius: 0.2em; - box-shadow: inset 0.08334em 0.08334em rgba(0, 0, 0, 0.08), 0 0.08334em rgba(242, 242, 242, 0.1); - border: 0.08334em solid @bg-entry-border; + box-shadow: inset 0.0834em 0.0834em rgba(0, 0, 0, 0.08), 0 0.0834em rgba(242, 242, 242, 0.1); + border: 0.0834em solid @bg-entry-border; background-color: @bg-scale-entry; } spinbutton { - margin: 0.08334em 0; + margin: 0.0834em 0; padding: 0; - min-height: 1.66667em; + min-height: 1.6666em; min-width: 0; border-radius: 0.2em; background-color: @bg-scale-entry; - border: 0.08334em solid @bg-entry-border; - box-shadow: inset 0.08334em 0.08334em rgba(0, 0, 0, 0.08), 0 0.08334em rgba(242, 242, 242, 0.1); + border: 0.0834em solid @bg-entry-border; + box-shadow: inset 0.0834em 0.0834em rgba(0, 0, 0, 0.08), 0 0.0834em rgba(242, 242, 242, 0.1); } #MyExpander spinbutton { - margin: 0.16667em 0; + margin: 0.1667em 0; padding: 0; - min-height: 1.33334em; + min-height: 1.3333em; min-width: 0; - border-top-left-radius: 1.83334em; - border-bottom-left-radius: 1.83334em; + border-top-left-radius: 1.8334em; + border-bottom-left-radius: 1.8334em; background-color: @bg-tb-spinbutton; - border: 0.08334em solid @bg-button-border; + border: 0.0834em solid @bg-button-border; color: @text-tbEntry; - box-shadow: inset 0.08334em 0.08334em rgba(0, 0, 0, .12), 0 0.08334em rgba(255, 255, 255, 0.12); + box-shadow: inset 0.0834em 0.0834em rgba(0, 0, 0, .12), 0 0.0834em rgba(255, 255, 255, 0.12); } #MyExpander button + label + spinbutton { margin: 0.25em 0; /* Needed for Reset & and Auto button height*/ } #MyExpander checkbutton + label + spinbutton { - margin: 0.33334em 0; /* Needed for Reset & and Auto checkbox button height*/ + margin: 0.3334em 0; /* Needed for Reset & and Auto checkbox button height*/ } #MyExpander image + spinbutton { @@ -1901,7 +1911,7 @@ spinbutton button { padding: 0; margin: 0; min-height: 0; - min-width: 1.33334em; + min-width: 1.3333em; background-image: none; background-color: transparent; border: none; @@ -1910,7 +1920,7 @@ spinbutton button { } #MyExpander spinbutton entry, spinbutton entry { - padding: 0 0.33334em; + padding: 0 0.3334em; margin: 0; min-height: 0; min-width: 0; @@ -1919,7 +1929,7 @@ spinbutton entry { background-color: transparent; } #MyExpander spinbutton entry { - padding: 0 0.33334em 0 0.83334em; + padding: 0 0.3334em 0 0.8334em; } #BatchQueueButtonsMainContainer spinbutton button:hover, @@ -1967,7 +1977,7 @@ entry:focus > selection { .view entry { background-color: @bg-dark-grey; margin: 0 -2px; - border: 0.08334em solid @accent-color; + border: 0.0834em solid @accent-color; box-shadow: none; } /* end*/ @@ -1978,20 +1988,20 @@ entry:focus > selection { :not(.popup):not(tooltip) > decoration { background-color: @winHeaderbar; background-image: none; - border-radius: 0.41667em 0.41667em 0 0; + border-radius: 0.4167em 0.4167em 0 0; border: none; padding: 0; - box-shadow: 0 0.25em 0.75em 0.08334em rgba(0, 0, 0, 0.5), 0 0 0 0.08334em @bg-dark-grey; - margin: 0.83334em; + box-shadow: 0 0.25em 0.75em 0.0834em rgba(0, 0, 0, 0.5), 0 0 0 0.0834em @bg-dark-grey; + margin: 0.8334em; } headerbar { background-color: shade(@winHeaderbar,1.12); - box-shadow: inset 0 0.08334em rgba(200,200,200,.13); + box-shadow: inset 0 0.0834em rgba(200,200,200,.13); background-image: linear-gradient(shade(@winHeaderbar,1.14), shade(@winHeaderbar,.86)); - border-bottom: 0.08334em solid @bg-dark-grey; - border-radius: 0.41667em 0.41667em 0 0; - min-height: 2.16667em; - padding: 0.08334em 0.41667em 0; + border-bottom: 0.0834em solid @bg-dark-grey; + border-radius: 0.4167em 0.4167em 0 0; + min-height: 2.1666em; + padding: 0.0834em 0.4167em 0; margin: 0; } messagedialog headerbar { @@ -2010,7 +2020,7 @@ headerbar .title{ /* Window in background */ :not(.popup):not(tooltip) > decoration:backdrop { - box-shadow: 0 0.25em 0.75em 0.08334em rgba(0, 0, 0, 0.3), 0 0 0 0.08334em @bg-dark-grey; + box-shadow: 0 0.25em 0.75em 0.0834em rgba(0, 0, 0, 0.3), 0 0 0 0.0834em @bg-dark-grey; } headerbar:backdrop { box-shadow: none; From 9cd10a319689af2872a5192c979148c786562df9 Mon Sep 17 00:00:00 2001 From: "U-PC-BUREAU\\jacques" Date: Thu, 6 Sep 2018 10:24:13 +0200 Subject: [PATCH 6/7] fixed several bug with ACES-P0 matrix GUI ICC --- rtdata/iccprofiles/output/RTv2_ACES-AP0.icc | Bin 25460 -> 25336 bytes rtdata/iccprofiles/output/RTv4_ACES-AP0.icc | Bin 764 -> 744 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/rtdata/iccprofiles/output/RTv2_ACES-AP0.icc b/rtdata/iccprofiles/output/RTv2_ACES-AP0.icc index 81818789851fe1861314b182408f07ba6613cfe5..34363781fa091909250c3ed101e06b24df93b335 100644 GIT binary patch literal 25336 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

eh>`Q>|al z5YN!hn4AeXlXa%%Oy8O5GplXnHpw=#wxG70wz{?}Z8L4(&oZ5rIcs?~^laYQlV`7< zeR_7IowZ$|-L^fv{XlzD`$+qX_TL>G9V#7;9Wfon9cMajbi6(X&hehpJm+>U>0If# z^XKlJdv_jvUiiGhd7txX=c~^5o}W7ZrIXYt*=gPx+_|swWarh+r=35#XkCh3_FYk3 zMP033*SlVKgKoZVt#0@3ABJKrWfuN=+)`<>`m>h?Ct5D?EP|)d{O$M<;Adz`4<~6j$E9-xOs{DlEx+1 zOG%f?E_GcRzx1h(&`0kx>kID7?Q7^8>U-Yz`!d&M^~)}o6EBxu?z}vH`O_7`75Wvk zDT@;yYR%QlS7)!T57Gve2OS6F1`iLO8@xaGVF*7&A2J^b8Ok4O8X6mVH4KLNhjoX& zhSP?thc6G$4sVRGjVO;ejl_=}9qAkyA6XeCjY^MNjfRgFj<$~89DO^68WR~a8VeZ9 z8EY6D9-ANAy2g7=`>Hv&fnd>$A3@np6|V^ zdnfJ<-g|Lx>ptIo-TOZGGw+|cKX`xs{`Ld@2YL^DA7nkKe=zi5ejJPojO&m4jc1Ra z93L5fH33ZsP8d!EOzfLzoEV#U{Sf(3Vo;>>X znESETW3R^|&eCTsXCr2dXFFye%zl2t^hDu_ zoV)I+Oqp{`tph8;pNxwQ12w(S-y*UclcfR zyXkiu?>XOVzxREg^SUSTr<0$?J}s_bSEN>KSK?O6S1zqQUD^CB@Y(2d$mhb(?Vra#fBi!HqW;D6 zOXin`FW0{;uM$>eR~=RpSF2Y0S6_UEzKVP`{~GbN`F zef#pA<-6*4kM9}Z8@^xrzPv_QlUs9KOI|y^c6IILI&xin-D*8%y>$KJ`jhp|4Z#iL zjj)a4jn0j!jg24NKXiWt{Mi4a?Z<;3t3PQ!HGX>k%=y{;^Y+h=znFe0|8o14{_Etg zYrmF%6MxJ9cK)66yY~0+?>B$2f29A||4I6D{Lj@tuQpMe^i7-1_|0RRS2ka4!CT^6 zR$DP!JXF0x(zr1`EJo0T?U*g9Tu)01Os@ z!2&Q?0EQQU;RRrL0T^BYh8KY01z>mq7+wH|7l7dfV0Zx-UI2y{fZ+vTcmWt*0EQQU z;RRrL0T^BYh8KY01z>mq7+wH|7l7dfV0Zx-UI2y{fZ+vTcme)D_5%EKufopl0EoX= z1Psu2ZZ!DtH|^XO@V8*Lw?A6`k2@BK|KpZ}e>&{^5O=)({yTnt=N)%{@Q$zFAH?p| L!T)*uzpwufP<;#C literal 25460 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 diff --git a/rtdata/iccprofiles/output/RTv4_ACES-AP0.icc b/rtdata/iccprofiles/output/RTv4_ACES-AP0.icc index 5dbe25a6906feedfdf8aae2977d544db2f0e7c8a..30df95eac32c139e238238d4a74b4166903b38d7 100644 GIT binary patch delta 234 zcmeyv`hr!5fr05oPI7KBiva^eZeB@Ikh_yYL}Zi#`y&QU1~vu`23`i~#N^@v-(a_p ziHTAZ-8}1ck_(DT7#J8G7#J9$%1a7B>^VTTNODGE3Xr`4$kr(W8UkeB0f{F;*dIXb zbTFHV1;j22333M7F9Bq0q(j&aAa)XjodIGeXB6cE)l2}gRZ?>EfaWtXZJ8{D1We8@_1+oGd3?_##erCKdxqwL>PR?LT0RSi?GK>HK delta 254 zcmaFC`iE7Afr05yPI7KBiva^eZeB@Ikh_yYL}Zi#`y&Qc1_1_624x1F#N^@v-(a_p ziHTAZ-8}0Zk_(DT7#J8s7#J9$%1a7B>QkVb_4z$r(ktKs8H%Y?YMUJfQhZOeZD_FiLBx z0EJ{292t@sQW=UF3K$F+;u#be(iv Date: Thu, 6 Sep 2018 10:39:35 +0200 Subject: [PATCH 7/7] Change matrix ACES-P0 and limit slider blue --- rtengine/iccmatrices.h | 12 ++++++------ rtengine/iplab2rgb.cc | 4 ++++ rtgui/iccprofilecreator.cc | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/rtengine/iccmatrices.h b/rtengine/iccmatrices.h index d20cb70c3..29426c62d 100644 --- a/rtengine/iccmatrices.h +++ b/rtengine/iccmatrices.h @@ -80,15 +80,15 @@ constexpr double xyz_sRGB[3][3] = { }; constexpr double xyz_ACESp0[3][3] = { - {0.9525523959, 0.0, 0.0000936786}, - {0.3439664498, 0.7281660966 , -0.0721325464}, - {0.0, -0.0, 1.0088251844} + {0.9908526, 0.0122334, -0.0388654}, + {0.3618807, 0.72255045 , -0.0843859}, + {-0.0027093, 0.0082323, 0.8196880} }; constexpr double ACESp0_xyz[3][3] = { - {1.0498110175, 0.0, -0.0000974845}, - {-0.4959030231, 1.3733130458 , 0.0982400361}, - {0.0, 0.0, 0.9912520182} + {1.01583320, -0.01772807, 0.04634052}, + {-0.50781231, 1.39131494 , 0.11915641}, + {0.00845768, -0.01403193, 1.21893277} }; constexpr double xyz_ACESp1[3][3] = { diff --git a/rtengine/iplab2rgb.cc b/rtengine/iplab2rgb.cc index cab77c8ab..c4707f16f 100644 --- a/rtengine/iplab2rgb.cc +++ b/rtengine/iplab2rgb.cc @@ -602,6 +602,10 @@ Imagefloat* ImProcFunctions::workingtrc(Imagefloat* working, int cw, int ch, int // 7 parameters for smoother curves cmsWhitePointFromTemp(&xyD, (double)temp); + if (profile == "ACESp0") { + xyD = {0.32168, 0.33767, 1.0};//refine white point to avoid differences + } + GammaTRC[0] = GammaTRC[1] = GammaTRC[2] = cmsBuildParametricToneCurve(NULL, five, gammaParams);//5 = more smoother than 4 oprofdef = cmsCreateRGBProfile(&xyD, &Primaries, GammaTRC); cmsFreeToneCurve(GammaTRC[0]); diff --git a/rtgui/iccprofilecreator.cc b/rtgui/iccprofilecreator.cc index a61f0e80d..8ae8d4ab9 100644 --- a/rtgui/iccprofilecreator.cc +++ b/rtgui/iccprofilecreator.cc @@ -117,7 +117,7 @@ ICCProfileCreator::ICCProfileCreator(RTWindow *rtwindow) setExpandAlignProperties(aPrimariesGreenY, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); aPrimariesBlueX = Gtk::manage(new Adjuster(M("ICCPROFCREATOR_PRIM_BLUX"), 0.0001, 0.1600, 0.0001, 0.1500/*, gamutl4, gamuts4*/)); setExpandAlignProperties(aPrimariesBlueX, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); - aPrimariesBlueY = Gtk::manage(new Adjuster(M("ICCPROFCREATOR_PRIM_BLUY"), -0.0700, 0.0700, 0.0001, 0.060/*, gamutl5, gamuts5*/)); + aPrimariesBlueY = Gtk::manage(new Adjuster(M("ICCPROFCREATOR_PRIM_BLUY"), -0.0800, 0.0700, 0.0001, 0.060/*, gamutl5, gamuts5*/)); setExpandAlignProperties(aPrimariesBlueY, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); primariesGrid->attach(*aPrimariesRedX, 0, 0, 1, 1);