From d224e0a232e9e155830d5c8dcc7fbe39b045f27d Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 9 Sep 2025 18:17:22 +0300 Subject: More texture updates #3; change selected font color to black --- indra/llui/lllineeditor.cpp | 3 +-- indra/newview/llcolorswatch.cpp | 18 +++++++++++++----- indra/newview/llpanelface.cpp | 2 +- indra/newview/skins/default/colors.xml | 21 ++++++++++++--------- .../textures/build/Object_Cone_Selected.png | Bin 576 -> 2394 bytes .../textures/build/Object_Cube_Selected.png | Bin 477 -> 2278 bytes .../textures/build/Object_Cylinder_Selected.png | Bin 443 -> 2273 bytes .../textures/build/Object_Grass_Selected.png | Bin 757 -> 2538 bytes .../textures/build/Object_Hemi_Cone_Selected.png | Bin 531 -> 2357 bytes .../build/Object_Hemi_Cylinder_Selected.png | Bin 463 -> 2292 bytes .../textures/build/Object_Hemi_Sphere_Selected.png | Bin 696 -> 2530 bytes .../textures/build/Object_Prism_Selected.png | Bin 485 -> 2419 bytes .../textures/build/Object_Pyramid_Selected.png | Bin 594 -> 2389 bytes .../textures/build/Object_Ring_Selected.png | Bin 738 -> 2560 bytes .../textures/build/Object_Sphere_Selected.png | Bin 1003 -> 2799 bytes .../textures/build/Object_Tetrahedron_Selected.png | Bin 558 -> 2394 bytes .../textures/build/Object_Torus_Selected.png | Bin 825 -> 2645 bytes .../textures/build/Object_Tree_Selected.png | Bin 839 -> 2794 bytes .../textures/build/Object_Tube_Selected.png | Bin 552 -> 2506 bytes .../skins/default/textures/locked_image_dark.png | Bin 0 -> 18122 bytes .../skins/default/textures/square_selection.png | Bin 0 -> 18061 bytes indra/newview/skins/default/textures/textures.xml | 3 +++ .../default/textures/widgets/ComboButton_UpOff.png | Bin 553 -> 16654 bytes .../textures/widgets/ComboButton_UpSelected.png | Bin 603 -> 16828 bytes .../default/textures/widgets/DropDown_Disabled.png | Bin 669 -> 15771 bytes .../default/textures/widgets/PushButton_Press.png | Bin 614 -> 15657 bytes .../default/textures/widgets/Stepper_Down_Off.png | Bin 477 -> 15325 bytes .../textures/widgets/Stepper_Down_Press.png | Bin 502 -> 15389 bytes .../default/textures/widgets/Stepper_Up_Off.png | Bin 482 -> 15315 bytes .../default/textures/widgets/Stepper_Up_Press.png | Bin 521 -> 15543 bytes .../default/xui/en/widgets/folder_view_item.xml | 2 +- .../xui/en/widgets/inbox_folder_view_folder.xml | 2 +- .../xui/en/widgets/inbox_folder_view_item.xml | 2 +- .../default/xui/en/widgets/simple_text_editor.xml | 2 +- 34 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 indra/newview/skins/default/textures/locked_image_dark.png create mode 100644 indra/newview/skins/default/textures/square_selection.png diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index b534c8d4e8..350c1e6996 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -1954,12 +1954,11 @@ void LLLineEditor::draw() width = llmin(width, mTextRightEdge - ll_round(rendered_pixels_right)); gl_rect_2d(ll_round(rendered_pixels_right), cursor_top, ll_round(rendered_pixels_right)+width, cursor_bottom, color); - LLColor4 tmp_color( 1.f - text_color.mV[0], 1.f - text_color.mV[1], 1.f - text_color.mV[2], alpha ); rendered_text += mFontBufferSelection.render( mGLFont, mText, mScrollHPos + rendered_text, rendered_pixels_right, text_bottom, - tmp_color, + LLColor4::black, LLFontGL::LEFT, LLFontGL::BOTTOM, 0, LLFontGL::NO_SHADOW, diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp index 97d2345778..ce236dec66 100644 --- a/indra/newview/llcolorswatch.cpp +++ b/indra/newview/llcolorswatch.cpp @@ -200,13 +200,14 @@ void LLColorSwatchCtrl::draw() F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency(); mBorder->setKeyboardFocusHighlight(hasFocus()); - // Draw border - LLRect border( 0, getRect().getHeight(), getRect().getWidth(), mLabelHeight ); - gl_rect_2d( border, mBorderColor.get(), false ); - LLRect interior = border; + LLRect gl_border(0, getRect().getHeight(), getRect().getWidth(), mLabelHeight); + LLColor4 gl_border_color = mBorderColor.get(); + LLRect interior = gl_border; interior.stretch( -1 ); + bool show_border_ctrl = true; + // Check state if ( mValid ) { @@ -239,7 +240,9 @@ void LLColorSwatchCtrl::draw() { if (mFallbackImage.notNull()) { - mFallbackImage->draw(interior.mLeft, interior.mBottom, interior.getWidth(), interior.getHeight(), LLColor4::white % alpha); + mFallbackImage->draw(interior.mLeft - 1, interior.mBottom - 1, mFallbackImage->getWidth(), mFallbackImage->getHeight(), LLColor4::white % alpha); + gl_border_color = LLUIColorTable::instance().getColor("ColorSwatchBorderColorGray").get(); + show_border_ctrl = false; } else { @@ -250,6 +253,11 @@ void LLColorSwatchCtrl::draw() } } + mBorder->setVisible(show_border_ctrl); + + // Draw border + gl_rect_2d(gl_border, gl_border_color, false); + LLUICtrl::draw(); } diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 3ab48f69c8..d7ffb88e35 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1904,7 +1904,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/) if (mColorSwatch) { mColorSwatch->setEnabled( false ); - mColorSwatch->setFallbackImage(LLUI::getUIImage("locked_image.j2c") ); + mColorSwatch->setFallbackImage(LLUI::getUIImage("locked_image") ); mColorSwatch->setValid(false); } diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 970b5a51de..c5f16cc342 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -10,7 +10,7 @@ value="0.3 0.82 1 0.13" /> + value="0.3 0.82 1 0.35" /> @@ -359,7 +359,7 @@ reference="Black" /> + reference="EmphasisColor" /> @@ -453,9 +453,6 @@ - @@ -862,19 +859,25 @@ + + - - + + + @@ -874,6 +876,7 @@ with the same filename but different name + diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png index 5a067aca7c..9e74524be4 100644 Binary files a/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png and b/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png differ diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png index ff56367147..aa8865c33d 100644 Binary files a/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png and b/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png differ diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png index 9a69f7e0d9..fff0cfaff2 100644 Binary files a/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png and b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png differ diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Press.png index b0a92d8ffe..8dfa9030b1 100644 Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Press.png and b/indra/newview/skins/default/textures/widgets/PushButton_Press.png differ diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png index 51d269bd45..720946aba6 100644 Binary files a/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png and b/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png differ diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png index b4f19b7dbb..505fa6c82c 100644 Binary files a/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png and b/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png differ diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png index a01d928aef..9482e4773e 100644 Binary files a/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png and b/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png differ diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png index d5b672d943..ca311768c4 100644 Binary files a/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png and b/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png differ diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml index 50c5285e04..3b20e3a908 100644 --- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml @@ -6,7 +6,7 @@ folder_indentation="8" item_height="20" item_top_pad="4" - selection_image="Rounded_Square" + selection_image="Square_Selection" mouse_opaque="true" follows="left|top|right" left_pad="5" diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml index 865c145022..41ef9d2b8a 100644 --- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml +++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml @@ -6,7 +6,7 @@ folder_indentation="8" item_height="20" item_top_pad="4" - selection_image="Rounded_Square" + selection_image="Square_Selection" left_pad="5" icon_pad="2" icon_width="16" diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml index 09cbb1d3ab..ad4249da4e 100644 --- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml @@ -2,7 +2,7 @@