github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 06:05:58 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

[PR #339] [MERGED] CtrlCore: Cocoa always use bundled icon #325

New issue
Closed
opened 2026-05-05 03:45:50 -06:00 by gitea-mirror · 0 comments
gitea-mirror commented 2026-05-05 03:45:50 -06:00
Owner
Copy link

📋 Pull Request Information

Original PR: https://github.com/ultimatepp/ultimatepp/pull/339
Author: @klugier
Created: 1/3/2026
Status: ✅ Merged
Merged: 1/12/2026
Merged by: @mirek-fidler

Base: master ← Head: klugier/cocoa-always-use-bundled-icon

📝 Commits (4)

📊 Changes

7 files changed (+38 additions, -9 deletions)

View changed files

📝 uppsrc/CtrlCore/CocoCtrl.h (+10 -5)
📝 uppsrc/CtrlCore/CocoTop.h (+2 -0)
📝 uppsrc/CtrlCore/CocoTop.mm (+11 -3)
📝 uppsrc/CtrlCore/CocoWin.mm (+5 -0)
📝 uppsrc/CtrlCore/CtrlCore.upp (+1 -1)
📝 uppsrc/ide/ide.cpp (+6 -0)
📝 uppsrc/ide/main.cpp (+3 -0)

📄 Description

This PR introduces SetAlwaysUseBundledIcon method for Cocoa. It supposed to globaly disable SyncAppIcon operation. Thanks to that the app that uses this function is more consistent with the macos feeling. Here is the samples:

  1. Before
    Zrzut ekranu 2026-01-3 o 02 05 05
    Zrzut ekranu 2026-01-3 o 02 06 31

  2. After
    Zrzut ekranu 2026-01-3 o 02 07 37
    Zrzut ekranu 2026-01-3 o 02 08 05

For 'After' the app icon in the dock during the runtime scales to the os settings. Without this option it does not.

Please feel free to rename the funcionality to whatever you want. I just tried to use your notation, but maybe we can name it better.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ultimatepp/ultimatepp/pull/339 **Author:** [@klugier](https://github.com/klugier) **Created:** 1/3/2026 **Status:** ✅ Merged **Merged:** 1/12/2026 **Merged by:** [@mirek-fidler](https://github.com/mirek-fidler) **Base:** `master` ← **Head:** `klugier/cocoa-always-use-bundled-icon` --- ### 📝 Commits (4) - [`82a76f8`](https://github.com/ultimatepp/ultimatepp/commit/82a76f8d10ac06e3e59d5d3de7e116fdddf9d510) CtrlCore: Cocoa always use bundled icon. - [`9833a48`](https://github.com/ultimatepp/ultimatepp/commit/9833a48d7f0d1ccc3fb07203bb286d20fbd7e79b) Reworked - [`d9cedcf`](https://github.com/ultimatepp/ultimatepp/commit/d9cedcf66592534c177009eeb1499b68ec531844) .cosmetics - [`9b4b2ae`](https://github.com/ultimatepp/ultimatepp/commit/9b4b2ae7ede821e719c53da464d2bbc44347657f) .simplified ### 📊 Changes **7 files changed** (+38 additions, -9 deletions) <details> <summary>View changed files</summary> 📝 `uppsrc/CtrlCore/CocoCtrl.h` (+10 -5) 📝 `uppsrc/CtrlCore/CocoTop.h` (+2 -0) 📝 `uppsrc/CtrlCore/CocoTop.mm` (+11 -3) 📝 `uppsrc/CtrlCore/CocoWin.mm` (+5 -0) 📝 `uppsrc/CtrlCore/CtrlCore.upp` (+1 -1) 📝 `uppsrc/ide/ide.cpp` (+6 -0) 📝 `uppsrc/ide/main.cpp` (+3 -0) </details> ### 📄 Description This PR introduces SetAlwaysUseBundledIcon method for Cocoa. It supposed to globaly disable SyncAppIcon operation. Thanks to that the app that uses this function is more consistent with the macos feeling. Here is the samples: 1. Before <img width="528" height="83" alt="Zrzut ekranu 2026-01-3 o 02 05 05" src="https://github.com/user-attachments/assets/016776d4-36fb-4ab4-b8c7-3b4439184db7" /> <img width="528" height="83" alt="Zrzut ekranu 2026-01-3 o 02 06 31" src="https://github.com/user-attachments/assets/e229bfab-3c7e-40af-8217-1f2999a67661" /> 2. After <img width="528" height="83" alt="Zrzut ekranu 2026-01-3 o 02 07 37" src="https://github.com/user-attachments/assets/5ad97ec6-3dfa-4abf-83e7-df05a4e7574f" /> <img width="528" height="83" alt="Zrzut ekranu 2026-01-3 o 02 08 05" src="https://github.com/user-attachments/assets/1dbc5c4b-2b1f-4e05-ac88-75a5403002ab" /> For 'After' the app icon in the dock during the runtime scales to the os settings. Without this option it does not. Please feel free to rename the funcionality to whatever you want. I just tried to use your notation, but maybe we can name it better. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
gitea-mirror 2026-05-05 03:45:50 -06:00
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
master
virtual_popups
QHD
klugier/view-draw-grid-ctrl-removal
custome_titlebar_refactor
klugier/help-icon-after-line-display
X11S
klugier/umk-check-git-command-statuses
diagram_dev
stable
klugier/lambda-captuer-warnings-gui-01
custom_titlebar
next2025_1
DarkModeContent
release_2024_1
pixelmode
blocksel
skin
bad_alloc
logs
TopSetRect
klugier/gdk-get-workarea-fixed-wayland
doc2024
Core2024
upp_14
animations
_t
layzoom
v2026.1
v2021.1
v2022.1
v2022.2
v2022.3
v2023.1
v2023.2
v2024.1
v2024.1.1
v2025.1
v2025.1.1
Labels
Clear labels   
pull-request

Mirrored from GitHub Pull Request

No labels
pull-request
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/ultimatepp#325
No description provided.
Delete branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?