Skip to content

Commit a3bcf05

Browse files
committed
Update libui-ng to support ImageViewer on Windows
1 parent 75dc135 commit a3bcf05

1 file changed

Lines changed: 1 addition & 71 deletions

File tree

include/ui.h

Lines changed: 1 addition & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -2043,7 +2043,6 @@ typedef struct uiAreaMouseEvent uiAreaMouseEvent;
20432043
typedef struct uiAreaKeyEvent uiAreaKeyEvent;
20442044

20452045
typedef struct uiDrawContext uiDrawContext;
2046-
typedef struct uiImage uiImage;
20472046

20482047
struct uiAreaHandler {
20492048
void (*Draw)(uiAreaHandler *, uiArea *, uiAreaDrawParams *);
@@ -2727,22 +2726,6 @@ _UI_EXTERN void uiDrawFreeTextLayout(uiDrawTextLayout *tl);
27272726
// uiDrawText() draws tl in c with the top-left point of tl at (x, y).
27282727
_UI_EXTERN void uiDrawText(uiDrawContext *c, uiDrawTextLayout *tl, double x, double y);
27292728

2730-
/**
2731-
* Draws an image on the drawing context.
2732-
*
2733-
* The image will be scaled to fit the specified width and height.
2734-
* The function automatically selects the most appropriate image representation
2735-
* based on the current display's pixel density and scaling factor.
2736-
*
2737-
* @param c Drawing context.
2738-
* @param img Image to draw. Must not be NULL.
2739-
* @param x X coordinate of the top-left corner.
2740-
* @param y Y coordinate of the top-left corner.
2741-
* @param width Width to draw the image. Must be positive.
2742-
* @param height Height to draw the image. Must be positive.
2743-
*/
2744-
_UI_EXTERN void uiDrawImage(uiDrawContext *c, uiImage *img, double x, double y, double width, double height);
2745-
27462729
// uiDrawTextLayoutExtents() returns the width and height of tl
27472730
// in width and height. The returned width may be smaller than
27482731
// the width passed into uiDrawNewTextLayout() depending on
@@ -3188,6 +3171,7 @@ _UI_EXTERN uiGrid *uiNewGrid(void);
31883171
* @struct uiImage
31893172
* @ingroup static
31903173
*/
3174+
typedef struct uiImage uiImage;
31913175

31923176
/**
31933177
* Creates a new image container.
@@ -3228,60 +3212,6 @@ _UI_EXTERN void uiFreeImage(uiImage *i);
32283212
*/
32293213
_UI_EXTERN void uiImageAppend(uiImage *i, void *pixels, int pixelWidth, int pixelHeight, int byteStride);
32303214

3231-
3232-
/**
3233-
* A control to display an image.
3234-
*
3235-
* Copy-owned semantics: SetImage() copies or retains an internal native image.
3236-
* Caller may free the source uiImage right after calling SetImage().
3237-
*
3238-
* @struct uiImageView
3239-
* @extends uiControl
3240-
* @ingroup static
3241-
*/
3242-
typedef struct uiImageView uiImageView;
3243-
#define uiImageView(this) ((uiImageView *)(this))
3244-
3245-
/**
3246-
* Content modes for image display.
3247-
*
3248-
* @enum uiImageViewContentMode
3249-
*/
3250-
_UI_ENUM(uiImageViewContentMode) {
3251-
uiImageViewContentCenter = 0, //!< 1:1 center, may clip or leave margins
3252-
uiImageViewContentFit, //!< aspect-fit (letterbox)
3253-
};
3254-
3255-
/**
3256-
* Creates a new image view control.
3257-
*
3258-
* @returns A new uiImageView instance.
3259-
* @memberof uiImageView @static
3260-
*/
3261-
_UI_EXTERN uiImageView* uiNewImageView(void);
3262-
3263-
/**
3264-
* Sets the image to display.
3265-
*
3266-
* Internally keeps its own native image for display.
3267-
* The caller may destroy the source uiImage after this call.
3268-
* Replacing the image frees the previous internal copy automatically.
3269-
*
3270-
* @param iv uiImageView instance.
3271-
* @param image Image to display, `NULL` to clear.
3272-
* @memberof uiImageView
3273-
*/
3274-
_UI_EXTERN void uiImageViewSetImage(uiImageView* iv, const uiImage* image);
3275-
3276-
/**
3277-
* Sets the scaling/content mode.
3278-
*
3279-
* @param iv uiImageView instance.
3280-
* @param mode Content mode to set. [Default: `uiImageViewContentFit`]
3281-
* @memberof uiImageView
3282-
*/
3283-
_UI_EXTERN void uiImageViewSetContentMode(uiImageView* iv, uiImageViewContentMode mode);
3284-
32853215
/**
32863216
* @addtogroup table
32873217
* @{

0 commit comments

Comments
 (0)